Updated build files

configure.ac

@@ -518,7 +518,7 @@ AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 
 dnl Autoconf output
-AC_OUTPUT([ src/piano_player-activity/Makefile src/name_identification-activity-activity/Makefile src/note_names-activity/Makefile src/world_music-activity/Makefile src/explore_world_template-activity/Makefile src/world_explore_template-activity/Makefile src/intro_gravity-activity/Makefile src/explore_world_music-activity/Makefile src/explore-activity/Makefile src/explore-activity/Makefile src/explore_world_animals-activity/Makefile src/new-activity/Makefile src/explore_world_animals-activity/Makefile src/explore_world_animals-activity/Makefile src/play_piano-activity/Makefile src/play_rhythm-activity/Makefile src/piano_composition-activity/Makefile src/explore_farm_animals-activity/Makefile src/explore_farm_animals-activity/Makefile src/justtesting-activity/Makefile
+AC_OUTPUT([
 Makefile
 Makefile.mingw
 autopackage/Makefile
@@ -656,6 +656,18 @@ src/erase-activity/resources/Makefile
 src/erase-activity/resources/erase/Makefile
 src/erase_2clic-activity/Makefile
 src/erase_clic-activity/Makefile
+src/explore-activity/Makefile
+src/explore-activity/resources/Makefile
+src/explore-activity/resources/explore/Makefile
+src/explore_farm_animals-activity/Makefile
+src/explore_farm_animals-activity/resources/Makefile
+src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile
+src/explore_world_animals-activity/Makefile
+src/explore_world_animals-activity/resources/Makefile
+src/explore_world_animals-activity/resources/explore_world_animals/Makefile
+src/explore_world_music-activity/Makefile
+src/explore_world_music-activity/resources/Makefile
+src/explore_world_music-activity/resources/explore_world_music/Makefile
 src/fifteen-activity/Makefile
 src/fifteen-activity/resources/Makefile
 src/fifteen-activity/resources/fifteen/Makefile
@@ -792,6 +804,7 @@ src/money_cents-activity/Makefile
 src/mosaic-activity/Makefile
 src/mosaic-activity/resources/Makefile
 src/mosaic-activity/resources/mosaic/Makefile
+src/note_names-activity/Makefile
 src/paintings-activity/Makefile
 src/paintings-activity/resources/Makefile
 src/paintings-activity/resources/paintings/Makefile
@@ -804,9 +817,29 @@ src/penalty-activity/resources/penalty/Makefile
 src/photohunter-activity/Makefile
 src/photohunter-activity/resources/Makefile
 src/photohunter-activity/resources/photohunter/Makefile
+src/piano_composition-activity/Makefile
+src/piano_composition-activity/resources/Makefile
+src/piano_composition-activity/resources/piano_composition/Makefile
+src/piano_composition-activity/resources/piano_composition/bass_pitches/Makefile
+src/piano_composition-activity/resources/piano_composition/bass_pitches/1/Makefile
+src/piano_composition-activity/resources/piano_composition/bass_pitches/2/Makefile
+src/piano_composition-activity/resources/piano_composition/bass_pitches/4/Makefile
+src/piano_composition-activity/resources/piano_composition/bass_pitches/8/Makefile
+src/piano_composition-activity/resources/piano_composition/buttons/Makefile
+src/piano_composition-activity/resources/piano_composition/playActivities/Makefile
+src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile
+src/piano_composition-activity/resources/piano_composition/treble_pitches/Makefile
+src/piano_composition-activity/resources/piano_composition/treble_pitches/1/Makefile
+src/piano_composition-activity/resources/piano_composition/treble_pitches/2/Makefile
+src/piano_composition-activity/resources/piano_composition/treble_pitches/4/Makefile
+src/piano_composition-activity/resources/piano_composition/treble_pitches/8/Makefile
 src/planegame-activity/Makefile
 src/planegame-activity/resources/Makefile
 src/planegame-activity/resources/planegame/Makefile
+src/play_piano-activity/Makefile
+src/play_rhythm-activity/Makefile
+src/play_rhythm-activity/resources/Makefile
+src/play_rhythm-activity/resources/play_rhythm/Makefile
 src/pythontemplate-activity/Makefile
 src/pythontest-activity/Makefile
 src/railroad-activity/Makefile

src/Makefile.am

@@ -3,7 +3,7 @@
 install-activity:
 	for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || break 0; done
 
-SUBDIRS = justtesting-activity explore_farm_animals-activity explore_farm_animals-activity piano_composition-activity play_rhythm-activity play_piano-activity got_rhythm-activity explore_world_animals-activity explore_world_animals-activity new-activity explore_world_animals-activity explore-activity explore-activity explore_world_music-activity intro_gravity-activity world_explore_template-activity explore_world_template-activity world_music-activity note_names-activity name_identification-activity-activity piano_player-activity \
+SUBDIRS = \
 	administration-activity \
 	advanced_colors-activity \
 	algebra_by-activity \
@@ -45,6 +45,10 @@ SUBDIRS = justtesting-activity explore_farm_animals-activity explore_farm_animal
 	erase-activity \
 	erase_2clic-activity \
 	erase_clic-activity \
+	explore-activity \
+	explore_farm_animals-activity \
+	explore_world_animals-activity \
+	explore_world_music-activity \
 	fifteen-activity \
 	findit-activity \
 	followline-activity \
@@ -104,11 +108,15 @@ SUBDIRS = justtesting-activity explore_farm_animals-activity explore_farm_animal
 	money_back_cents-activity \
 	money_cents-activity \
 	mosaic-activity \
+	note_names-activity \
 	paintings-activity \
 	paratrooper-activity \
 	penalty-activity \
 	photohunter-activity \
+	piano_composition-activity \
 	planegame-activity \
+	play_piano-activity \
+	play_rhythm-activity \
 	pythontemplate-activity \
 	pythontest-activity \
 	railroad-activity \

src/explore-activity/Makefile.am

@@ -0,0 +1,10 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+
+SUBDIRS = resources
+
+pythondir = $(PYTHON_PLUGIN_DIR)
+
+dist_python_DATA= 	explore.py
+
+EXTRA_DIST = init_path.sh

src/explore-activity/explore.py

@@ -43,7 +43,11 @@
 RECORD_LOCATIONS = False
 # -----------------------------------------------------------------------------
 
-ExploreActivityResourcesFilepath = '..//src/explore-activity/resources/explore/'
+ExploreActivityResourcesFilepath = "%s/explore/" % gcompris.DATA_DIR
+
+#Uncomment following line to run gcompris in the build folder.
+#ExploreActivityResourcesFilepath = '..//src/explore-activity/resources/explore/'
+
 class Gcompris_explore:
 
     def __init__(self, gcomprisBoard):

src/explore-activity/resources/explore/Makefile.am

@@ -0,0 +1,14 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore
+img_DATA = \
+	border.png \
+	defaultCompletedLocationPic.png \
+	defaultLocationPic.png \
+	default.png \
+	happyFace.png \
+	playbutton.png \
+	ribbon.png \
+	sadFace.png \
+	star.png \
+	winner.png
+
+EXTRA_DIST = $(img_DATA)

src/explore_farm_animals-activity/Makefile.am

@@ -1,13 +1,7 @@
 # Passthrough, do not break uplevel make rule
 install-activity:
 
-SUBDIRS =
-
-pythondir = $(PYTHON_PLUGIN_DIR)
-
-dist_python_DATA= 	explore_farm_animals.py
-
-
+SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 

src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am

@@ -0,0 +1,25 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_farm_animals
+img_DATA = \
+	cat.jpg\
+	cat.ogg\
+	chicken.jpg\
+	chickens.ogg\
+	content.desktop.in\
+	cow.jpg\
+	cow.ogg\
+	dog.jpg\
+	dog.ogg\
+	duck.jpg\
+	duck.ogg\
+	farm-animals.jpg\
+	horse.jpg\
+	horse.ogg\
+	owl.jpg\
+	owl.ogg\
+	pig.jpg\
+	pig.ogg\
+	questionpic.png\
+	rooster.jpg\
+	rooster.ogg
+
+EXTRA_DIST = $(img_DATA)

src/explore_world_animals-activity/Makefile.am

@@ -1,13 +1,7 @@
 # Passthrough, do not break uplevel make rule
 install-activity:
 
-SUBDIRS =
-
-pythondir = $(PYTHON_PLUGIN_DIR)
-
-dist_python_DATA= 	explore_world_animals.py
-
-
+SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 

src/explore_world_animals-activity/resources/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = explore_world_animals

src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am

@@ -0,0 +1,12 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_world_animals
+img_DATA = \
+	bison.jpg\
+	content.desktop.in\
+	giraffe.jpg\
+	hedgy.jpg\
+	jaggy.jpg\
+	narwhal.jpg\
+	tux.png\
+	world.jpg
+
+EXTRA_DIST = $(img_DATA)

src/explore_world_music-activity/Makefile.am

@@ -1,13 +1,7 @@
 # Passthrough, do not break uplevel make rule
 install-activity:
 
-SUBDIRS =
-
-pythondir = $(PYTHON_PLUGIN_DIR)
-
-dist_python_DATA= 	explore_world_music.py
-
-
+SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
 

src/explore_world_music-activity/resources/explore_world_music/Makefile.am

@@ -0,0 +1,26 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_world_music
+img_DATA = \
+	africa.jpg\
+	africa.ogg\
+	america.jpg\
+	america.ogg\
+	australia.jpg\
+	australia.ogg\
+	beethoven.ogg\
+	content.desktop.in\
+	dancingWorld.png\
+	ireland.jpg\
+	ireland.ogg\
+	italy.jpg\
+	italy.ogg\
+	japan.jpg\
+	japan.ogg\
+	mexico.jpg\
+	mexico.ogg\
+	middleeast.jpg\
+	middleeast.ogg\
+	orchestra.jpg\
+	suitcase.png\
+	worldmap.jpg
+
+EXTRA_DIST = $(img_DATA)

src/geography-activity/resources/geography/europe/Makefile.am

@@ -31,8 +31,7 @@ img_DATA = \
 	portugal.png \
 	romania.png \
 	russia.png \
-	serbia.png \
-	montenegro.png \
+	serbia_montenegro.png \
 	slovakia.png \
 	slovenia.png \
 	spain.png \

src/note_names-activity/.gitignore

@@ -0,0 +1 @@
+note_names.xml

src/note_names-activity/Makefile.am

@@ -0,0 +1,35 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+
+SUBDIRS =
+
+pythondir = $(PYTHON_PLUGIN_DIR)
+
+dist_python_DATA= 	note_names.py
+
+
+
+xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
+
+xml_in_files = \
+	note_names.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@
+
+icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
+icon_DATA = note_names.svg
+
+EXTRA_DIST = $(icon_DATA) ${xml_in_files} init_path.sh
+CLEANFILES = $(xml_DATA)

src/piano_composition-activity/Makefile.am

@@ -1,11 +1,11 @@
 # Passthrough, do not break uplevel make rule
 install-activity:
 
-SUBDIRS =
+SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
 
-dist_python_DATA= 	piano_composition.py
+dist_python_DATA= 	piano_composition.py gcomprismusic.py
 
 
 

src/piano_composition-activity/resources/piano_composition/Makefile.am

@@ -0,0 +1,28 @@
+SUBDIRS = bass_pitches buttons playActivities treble_pitches
+
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition
+img_DATA = \
+	bach.jpg\
+	banana.png\
+	bassClef.png\
+	blackflat.png\
+	blacksharp.png\
+	eighthNote.png\
+	flag.png\
+	gsoc2012.jpg\
+	halfNote.png\
+	happyNote.png\
+	keyboard.png\
+	load.png\
+	melodies.desktop.in\
+	mozart.jpg\
+	note_highlight.png\
+	quarterNote.png\
+	sadNote.png\
+	save.png\
+	trebleClef.png\
+	wholeNote.png
+
+
+
+EXTRA_DIST = $(img_DATA)

src/piano_composition-activity/resources/piano_composition/bass_pitches/1/Makefile.am

@@ -0,0 +1,18 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/bass_pitches/1
+img_DATA = \
+	\-1.wav \
+	1.wav \
+	\-2.wav \
+	2.wav \
+	\-3.wav \
+	3.wav \
+	\-4.wav \
+	4.wav \
+	\-5.wav \
+	5.wav \
+	6.wav \
+	7.wav \
+	8.wav
+
+EXTRA_DIST = $(img_DATA)
+

src/piano_composition-activity/resources/piano_composition/bass_pitches/2/Makefile.am

@@ -0,0 +1,18 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/bass_pitches/2
+img_DATA = \
+	\-1.wav \
+	1.wav \
+	\-2.wav \
+	2.wav \
+	\-3.wav \
+	3.wav \
+	\-4.wav \
+	4.wav \
+	\-5.wav \
+	5.wav \
+	6.wav \
+	7.wav \
+	8.wav
+
+EXTRA_DIST = $(img_DATA)
+