GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit f06aaf60 authored by Bruno Coudoin's avatar Bruno Coudoin

More migration to new architecture

svn path=/branches/gcomprixo/; revision=2807
parent 066f2fc4
......@@ -605,7 +605,6 @@ src/billard-activity/activity/Makefile
src/boards/Makefile
src/boards/python/DTW/Makefile
src/boards/python/Makefile
src/boards/python/admin/Makefile
src/boards/python/connect4p/Makefile
src/boards/python/gcompris/Makefile
src/boards/python/gcompris/admin/Makefile
......@@ -760,6 +759,11 @@ src/wordsgame-activity/Makefile
src/wordsgame-activity/activity/Makefile
src/anim-activity/activity/Makefile
src/anim-activity/Makefile
src/administration-activity/activity/Makefile
src/administration-activity/Makefile
src/administration-activity/admin/Makefile
src/algorithm-activity/activity/Makefile
src/algorithm-activity/Makefile
])
echo ""
......
......@@ -78,4 +78,6 @@ SUBDIRS = libart_lgpl libgnomecanvas libccc gcompris boards \
traffic-activity \
wordprocessor-activity \
wordsgame-activity \
anim-activity
anim-activity \
administration-activity \
algorithm-activity
SUBDIRS = activity
pythondir = $(PYTHON_PLUGIN_DIR)
dist_python_DATA= administration.py
xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
xml_in_files = \
administration.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
# in the file themselves. GCompris pick the translations from the po file at
# runtime.
#
$(xml_DATA): %.xml: %.xml.in
sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
# Use this directive and instead of the one above to embed the translations
# in the xml files directly, this is needed for the tool gcompris2spip
#@INTLTOOL_XML_RULE@
CLEANFILES = $(xml_DATA)
../../../boards/skins/
\ No newline at end of file
activity=administration
plugindir=.
if [ -f ../boards/.libs/libpython.so ]
then
plugindir=../boards/.libs
fi
./gcompris.bin -L $plugindir -P . -A resources \
--config-dir=. -M activity \
--locale_dir=./locale -a $*
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libadvanced_colors.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libadvanced_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS)
libadvanced_colors_la_LIBADD =
libadvanced_colors_la_SOURCES = advanced_colors.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libalgebra.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libalgebra_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libalgebra_la_LIBADD =
libalgebra_la_SOURCES = algebra.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libalgebra_guesscount.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libalgebra_guesscount_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libalgebra_guesscount_la_LIBADD =
libalgebra_guesscount_la_SOURCES = algebra_guesscount.c
SUBDIRS = activity
pythondir = $(PYTHON_PLUGIN_DIR)
dist_python_DATA= algorithm.py
xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
xml_in_files = \
algorithm.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
# in the file themselves. GCompris pick the translations from the po file at
# runtime.
#
$(xml_DATA): %.xml: %.xml.in
sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
# Use this directive and instead of the one above to embed the translations
# in the xml files directly, this is needed for the tool gcompris2spip
#@INTLTOOL_XML_RULE@
CLEANFILES = $(xml_DATA)
......@@ -68,13 +68,20 @@ class Gcompris_algorithm:
def start(self):
gcompris.bar_set (0)
gcompris.set_background(self.gcomprisBoard.canvas.root(),
"opt/scenery5_background.png")
"algorithm/scenery5_background.png")
self.gcomprisBoard.level=1
self.gcomprisBoard.sublevel=1
self.gcomprisBoard.number_of_sublevel=5
self.gcomprisBoard.maxlevel = 1
self.symbollist = ["gcompris/misc/apple.png","gcompris/misc/strawberry.png","gcompris/misc/peer.png","gcompris/misc/football.png","gcompris/misc/cerise.png","gcompris/misc/egg.png","gcompris/misc/glass.png","gcompris/misc/eggpot.png"]
self.symbollist = ["algorithm/apple.png",
"algorithm/strawberry.png",
"algorithm/peer.png",
"algorithm/football.png",
"algorithm/cerise.png",
"algorithm/egg.png",
"algorithm/glass.png",
"algorithm/eggpot.png"]
self.pixlist = []
for i in range (len(self.symbollist)):
pixbuf2 = gcompris.utils.load_pixmap(self.symbollist [i])
......@@ -173,11 +180,9 @@ class Gcompris_algorithm:
font = gcompris.skin.get_font("gcompris/board/huge bold"))
def key_press(self, keyval, commit_str, preedit_str):
print("got key %i" % keyval)
return False
def set_level(self, level):
print("Gcompris_algorithm set level. %i" % level)
self.gcomprisBoard.level=level;
self.gcomprisBoard.sublevel=1;
self.cleanup()
......
../../../boards/skins/
\ No newline at end of file
activity=algorithm
plugindir=.
if [ -f ../boards/.libs/libpython.so ]
then
plugindir=../boards/.libs
fi
./gcompris.bin -L $plugindir -P . -A resources \
--config-dir=. -M activity \
--locale_dir=./locale -l /discovery/miscelaneous/$activity $*
SUBDIRS = activity
pythondir = \$(PYTHON_PLUGIN_DIR)
dist_python_DATA= anim.py
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libawele.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libawele_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libawele_la_LIBADD =
libawele_la_SOURCES = awele.c awele_alphaBeta.c awele_utils.c awele_utils.h awele.h
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libshapegame.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libshapegame_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libshapegame_la_LIBADD =
libshapegame_la_SOURCES = shapegame.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libbillard.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libbillard_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libbillard_la_LIBADD =
libbillard_la_SOURCES = billard.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libcanal_lock.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libcanal_lock_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libcanal_lock_la_LIBADD =
libcanal_lock_la_SOURCES = canal_lock.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libchess.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libchess_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libchess_la_LIBADD =
libchess_la_SOURCES = chess.c \
chess_makros.h \
chess_notation.c \
chess_notation.h \
chess_position.c \
chess_position.h
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libclick_on_letter.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libclick_on_letter_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libclick_on_letter_la_LIBADD =
libclick_on_letter_la_SOURCES = click_on_letter.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libclickgame.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libclickgame_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libclickgame_la_LIBADD =
libclickgame_la_SOURCES = clickgame.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libclockgame.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libclockgame_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libclockgame_la_LIBADD =
libclockgame_la_SOURCES = clockgame.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libcolors.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libcolors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libcolors_la_LIBADD =
libcolors_la_SOURCES = colors.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libcrane.la
libdir = $(plugindir)
INCLUDES = -I$(top_srcdir)/src \
-I$(top_srcdir)/intl \
$(GCOMPRIS_CFLAGS) \
$(XML_CFLAGS) \
$(dll_export)
libcrane_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs)
libcrane_la_LIBADD =
libcrane_la_SOURCES = crane.c
SUBDIRS = activity
if PLATFORM_WIN32
shared = -shared
no_undefined = -no-undefined
gc_libs = $(GCOMPRIS_LIBS)
dll_export = -DBOARD_DLL_EXPORT
else
shared =
no_undefined =
gc_libs =
dll_export =
endif
lib_LTLIBRARIES = \
libenumerate.la
libdir = $(plugindir)