[gcompris-devel] 0install feeds with v9
Aleksey Lim
alsroot at member.fsf.org
Thu Feb 11 07:44:48 UTC 2010
On Wed, Feb 10, 2010 at 09:12:20PM +0100, Bruno Coudoin wrote:
>
> Great, I'll be happy to integrate it.
>
> Bruno.
>
> Le mercredi 10 février 2010 à 11:21 +0000, Aleksey Lim a écrit :
> > While packaging GC I made some changes I think it could be useful to
> > keep them in upstream tree.
> >
> > Last patch adds new make target install-activity which will install all
> > activities to separate directories to let package them separately.
I've fixed several buildtime issues and removed symlinks
it could be applied from attached patch
0001-Fix-install-activity-build-invoking-do-not-use-symli.patch
or from new version of patchet which is rebased to new master
--
Aleksey
-------------- next part --------------
>From 303f498b64f195a51ac583b79d52fb2bfb7f07f7 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot at member.fsf.org>
Date: Thu, 11 Feb 2010 07:35:59 +0000
Subject: Fix install-activity build invoking; do not use symlinks for dependencies
diff --git a/Makefile.activity b/Makefile.activity
index eb78184..e01f84b 100644
--- a/Makefile.activity
+++ b/Makefile.activity
@@ -2,7 +2,7 @@ ACTIVITY_DESTDIR = $(DESTDIR)/activities/$(notdir $(abs_builddir))
install-activity: all-am
@[ "$(DESTDIR)" ] || (echo 'Pass DESTDIR with $@'; false)
- for i in $(ACTIVITY_SUBDIRS); do $(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) -C $$i install || break; done
+ for i in $(ACTIVITY_SUBDIRS); do $(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) -C ../$$i install || break 0; done
$(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) install
$(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) -C $(top_builddir)/src/gcompris install
$(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) -C $(top_builddir)/src/goocanvas install
@@ -14,8 +14,8 @@ install-activity: all-am
fi
mv $(ACTIVITY_DESTDIR)/$(bindir)/gcompris{,.orig}
launcher=$(ACTIVITY_DESTDIR)/$(bindir)/gcompris; \
- name="$$(cat $(builddir)/*.xml | grep -Po 'name *= *"[^"]+' | grep -Po '(?<=").+')"; \
- section="$$(cat $(builddir)/*.xml | grep -Po 'section *= *"[^"]+' | grep -Po '(?<=").+')"; \
+ name="$$(cat $(builddir)/*.xml | grep -o 'name *= *"[^"]\+' | awk -F\" '{print $$2}')"; \
+ section="$$(cat $(builddir)/*.xml | grep -o 'section *= *"[^"]\+' | awk -F\" '{print $$2}')"; \
echo -e "#!/bin/sh\n\$$(dirname \$$0)/gcompris.orig -l $$section/$$name \$$@" > $$launcher; \
chmod 0755 $$launcher
$(top_srcdir)/po/pickout $(abs_builddir) $(ACTIVITY_DESTDIR)/$(datadir)
diff --git a/Makefile.am b/Makefile.am
index 88c3e45..bb5cf26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,8 @@ EXTRA_DIST = \
gnome2-macros/gnome-deprecated-macros.m4 \
README.mingw README.translators README.windows \
config.h.mingw.in Makefile.mingw.in global_win32.mak gcompris.ico gc_admin.ico gcompris-uninstal.ico \
- gcompris-installer.nsi.in
+ gcompris-installer.nsi.in \
+ po/pickout
distcore = $(PACKAGE)-core-$(VERSION)
@@ -210,4 +211,4 @@ endif
endif
install-activity: all-am
- $(MAKE) -C $(top_srcdir)/src $@
+ $(MAKE) -C src $@
diff --git a/src/Makefile.am b/src/Makefile.am
index 689f958..91794c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
install-activity: all-am
- for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
+ for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || break 0; done
SUBDIRS = goocanvas gcompris boards \
advanced_colors-activity \
diff --git a/src/algebra_guesscount-activity/algebra_by-activity b/src/algebra_guesscount-activity/algebra_by-activity
deleted file mode 120000
index da941f4..0000000
--- a/src/algebra_guesscount-activity/algebra_by-activity
+++ /dev/null
@@ -1 +0,0 @@
-../algebra_by-activity
\ No newline at end of file
diff --git a/src/algebra_minus-activity/algebra_by-activity b/src/algebra_minus-activity/algebra_by-activity
deleted file mode 120000
index da941f4..0000000
--- a/src/algebra_minus-activity/algebra_by-activity
+++ /dev/null
@@ -1 +0,0 @@
-../algebra_by-activity
\ No newline at end of file
diff --git a/src/algebra_plus-activity/algebra_by-activity b/src/algebra_plus-activity/algebra_by-activity
deleted file mode 120000
index da941f4..0000000
--- a/src/algebra_plus-activity/algebra_by-activity
+++ /dev/null
@@ -1 +0,0 @@
-../algebra_by-activity
\ No newline at end of file
diff --git a/src/babyshapes-activity/babymatch-activity b/src/babyshapes-activity/babymatch-activity
deleted file mode 120000
index d9798f9..0000000
--- a/src/babyshapes-activity/babymatch-activity
+++ /dev/null
@@ -1 +0,0 @@
-../babymatch-activity
\ No newline at end of file
diff --git a/src/chess_movelearn-activity/chess_computer-activity b/src/chess_movelearn-activity/chess_computer-activity
deleted file mode 120000
index 6245d10..0000000
--- a/src/chess_movelearn-activity/chess_computer-activity
+++ /dev/null
@@ -1 +0,0 @@
-../chess_computer-activity
\ No newline at end of file
diff --git a/src/chess_partyend-activity/chess_computer-activity b/src/chess_partyend-activity/chess_computer-activity
deleted file mode 120000
index 6245d10..0000000
--- a/src/chess_partyend-activity/chess_computer-activity
+++ /dev/null
@@ -1 +0,0 @@
-../chess_computer-activity
\ No newline at end of file
diff --git a/src/chronos-activity/babymatch-activity b/src/chronos-activity/babymatch-activity
deleted file mode 120000
index d9798f9..0000000
--- a/src/chronos-activity/babymatch-activity
+++ /dev/null
@@ -1 +0,0 @@
-../babymatch-activity
\ No newline at end of file
diff --git a/src/clickanddraw-activity/drawnumber-activity b/src/clickanddraw-activity/drawnumber-activity
deleted file mode 120000
index 3fb1841..0000000
--- a/src/clickanddraw-activity/drawnumber-activity
+++ /dev/null
@@ -1 +0,0 @@
-../drawnumber-activity
\ No newline at end of file
diff --git a/src/connect4-2players-activity/connect4-activity b/src/connect4-2players-activity/connect4-activity
deleted file mode 120000
index b5daff0..0000000
--- a/src/connect4-2players-activity/connect4-activity
+++ /dev/null
@@ -1 +0,0 @@
-../connect4-activity/
\ No newline at end of file
diff --git a/src/doubleentry-activity/babymatch-activity b/src/doubleentry-activity/babymatch-activity
deleted file mode 120000
index d9798f9..0000000
--- a/src/doubleentry-activity/babymatch-activity
+++ /dev/null
@@ -1 +0,0 @@
-../babymatch-activity
\ No newline at end of file
diff --git a/src/draw-activity/anim-activity b/src/draw-activity/anim-activity
deleted file mode 120000
index 60e1995..0000000
--- a/src/draw-activity/anim-activity
+++ /dev/null
@@ -1 +0,0 @@
-../anim-activity/
\ No newline at end of file
diff --git a/src/erase_2clic-activity/erase-activity b/src/erase_2clic-activity/erase-activity
deleted file mode 120000
index 16f981d..0000000
--- a/src/erase_2clic-activity/erase-activity
+++ /dev/null
@@ -1 +0,0 @@
-../erase-activity
\ No newline at end of file
diff --git a/src/erase_clic-activity/erase-activity b/src/erase_clic-activity/erase-activity
deleted file mode 120000
index 16f981d..0000000
--- a/src/erase_clic-activity/erase-activity
+++ /dev/null
@@ -1 +0,0 @@
-../erase-activity
\ No newline at end of file
diff --git a/src/geo_country-activity/babymatch-activity b/src/geo_country-activity/babymatch-activity
deleted file mode 120000
index d9798f9..0000000
--- a/src/geo_country-activity/babymatch-activity
+++ /dev/null
@@ -1 +0,0 @@
-../babymatch-activity
\ No newline at end of file
diff --git a/src/geography-activity/babymatch-activity b/src/geography-activity/babymatch-activity
deleted file mode 120000
index d9798f9..0000000
--- a/src/geography-activity/babymatch-activity
+++ /dev/null
@@ -1 +0,0 @@
-../babymatch-activity
\ No newline at end of file
diff --git a/src/gnumch-factors-activity/gnumch-equality-activity b/src/gnumch-factors-activity/gnumch-equality-activity
deleted file mode 120000
index f5a0489..0000000
--- a/src/gnumch-factors-activity/gnumch-equality-activity
+++ /dev/null
@@ -1 +0,0 @@
-../gnumch-equality-activity
\ No newline at end of file
diff --git a/src/gnumch-inequality-activity/gnumch-equality-activity b/src/gnumch-inequality-activity/gnumch-equality-activity
deleted file mode 120000
index f5a0489..0000000
--- a/src/gnumch-inequality-activity/gnumch-equality-activity
+++ /dev/null
@@ -1 +0,0 @@
-../gnumch-equality-activity
\ No newline at end of file
diff --git a/src/gnumch-multiples-activity/gnumch-equality-activity b/src/gnumch-multiples-activity/gnumch-equality-activity
deleted file mode 120000
index f5a0489..0000000
--- a/src/gnumch-multiples-activity/gnumch-equality-activity
+++ /dev/null
@@ -1 +0,0 @@
-../gnumch-equality-activity
\ No newline at end of file
diff --git a/src/gnumch-primes-activity/gnumch-equality-activity b/src/gnumch-primes-activity/gnumch-equality-activity
deleted file mode 120000
index f5a0489..0000000
--- a/src/gnumch-primes-activity/gnumch-equality-activity
+++ /dev/null
@@ -1 +0,0 @@
-../gnumch-equality-activity
\ No newline at end of file
diff --git a/src/imagename-activity/babymatch-activity b/src/imagename-activity/babymatch-activity
deleted file mode 120000
index d9798f9..0000000
--- a/src/imagename-activity/babymatch-activity
+++ /dev/null
@@ -1 +0,0 @@
-../babymatch-activity
\ No newline at end of file
diff --git a/src/magic_hat_plus-activity/magic_hat_minus-activity b/src/magic_hat_plus-activity/magic_hat_minus-activity
deleted file mode 120000
index e05a90b..0000000
--- a/src/magic_hat_plus-activity/magic_hat_minus-activity
+++ /dev/null
@@ -1 +0,0 @@
-../magic_hat_minus-activity
\ No newline at end of file
diff --git a/src/maze2DRelative-activity/maze-activity b/src/maze2DRelative-activity/maze-activity
deleted file mode 120000
index c7d4029..0000000
--- a/src/maze2DRelative-activity/maze-activity
+++ /dev/null
@@ -1 +0,0 @@
-../maze-activity
\ No newline at end of file
diff --git a/src/maze3D-activity/maze-activity b/src/maze3D-activity/maze-activity
deleted file mode 120000
index c7d4029..0000000
--- a/src/maze3D-activity/maze-activity
+++ /dev/null
@@ -1 +0,0 @@
-../maze-activity
\ No newline at end of file
diff --git a/src/mazeInvisible-activity/maze-activity b/src/mazeInvisible-activity/maze-activity
deleted file mode 120000
index c7d4029..0000000
--- a/src/mazeInvisible-activity/maze-activity
+++ /dev/null
@@ -1 +0,0 @@
-../maze-activity
\ No newline at end of file
diff --git a/src/memory_add-activity/memory-activity b/src/memory_add-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_add-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_add_minus-activity/memory-activity b/src/memory_add_minus-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_add_minus-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_add_minus_mult_div-activity/memory-activity b/src/memory_add_minus_mult_div-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_add_minus_mult_div-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_add_minus_mult_div_tux-activity/memory-activity b/src/memory_add_minus_mult_div_tux-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_add_minus_mult_div_tux-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_add_minus_tux-activity/memory-activity b/src/memory_add_minus_tux-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_add_minus_tux-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_add_tux-activity/memory-activity b/src/memory_add_tux-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_add_tux-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_div-activity/memory-activity b/src/memory_div-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_div-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_div_tux-activity/memory-activity b/src/memory_div_tux-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_div_tux-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_enumerate-activity/memory-activity b/src/memory_enumerate-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_enumerate-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_minus-activity/memory-activity b/src/memory_minus-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_minus-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_minus_tux-activity/memory-activity b/src/memory_minus_tux-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_minus_tux-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_mult-activity/memory-activity b/src/memory_mult-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_mult-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_mult_div-activity/memory-activity b/src/memory_mult_div-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_mult_div-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_mult_div_tux-activity/memory-activity b/src/memory_mult_div_tux-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_mult_div_tux-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_mult_tux-activity/memory-activity b/src/memory_mult_tux-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_mult_tux-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_sound-activity/memory-activity b/src/memory_sound-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_sound-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_sound_tux-activity/memory-activity b/src/memory_sound_tux-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_sound_tux-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_tux-activity/memory-activity b/src/memory_tux-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_tux-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/memory_wordnumber-activity/memory-activity b/src/memory_wordnumber-activity/memory-activity
deleted file mode 120000
index f745c9d..0000000
--- a/src/memory_wordnumber-activity/memory-activity
+++ /dev/null
@@ -1 +0,0 @@
-../memory-activity
\ No newline at end of file
diff --git a/src/money_cents-activity/money-activity b/src/money_cents-activity/money-activity
deleted file mode 120000
index 994f098..0000000
--- a/src/money_cents-activity/money-activity
+++ /dev/null
@@ -1 +0,0 @@
-../money-activity/
\ No newline at end of file
diff --git a/src/paintings-activity/babymatch-activity b/src/paintings-activity/babymatch-activity
deleted file mode 120000
index f3d789c..0000000
--- a/src/paintings-activity/babymatch-activity
+++ /dev/null
@@ -1 +0,0 @@
-../babymatch-activity/
\ No newline at end of file
diff --git a/src/readingv-activity/readingh-activity b/src/readingv-activity/readingh-activity
deleted file mode 120000
index b8c3e1a..0000000
--- a/src/readingv-activity/readingh-activity
+++ /dev/null
@@ -1 +0,0 @@
-../readingh-activity/
\ No newline at end of file
diff --git a/src/redraw-activity/anim-activity b/src/redraw-activity/anim-activity
deleted file mode 120000
index 60e1995..0000000
--- a/src/redraw-activity/anim-activity
+++ /dev/null
@@ -1 +0,0 @@
-../anim-activity/
\ No newline at end of file
diff --git a/src/redraw_symmetrical-activity/redraw-activity b/src/redraw_symmetrical-activity/redraw-activity
deleted file mode 120000
index 68b4066..0000000
--- a/src/redraw_symmetrical-activity/redraw-activity
+++ /dev/null
@@ -1 +0,0 @@
-../redraw-activity/
\ No newline at end of file
diff --git a/src/scalesboard_weight-activity/scalesboard-activity b/src/scalesboard_weight-activity/scalesboard-activity
deleted file mode 120000
index 4eedd0f..0000000
--- a/src/scalesboard_weight-activity/scalesboard-activity
+++ /dev/null
@@ -1 +0,0 @@
-../scalesboard-activity
\ No newline at end of file
diff --git a/src/searace1player-activity/searace-activity b/src/searace1player-activity/searace-activity
deleted file mode 120000
index bb72ac0..0000000
--- a/src/searace1player-activity/searace-activity
+++ /dev/null
@@ -1 +0,0 @@
-../searace-activity
\ No newline at end of file
diff --git a/src/smallnumbers2-activity/smallnumbers-activity b/src/smallnumbers2-activity/smallnumbers-activity
deleted file mode 120000
index c0dc597..0000000
--- a/src/smallnumbers2-activity/smallnumbers-activity
+++ /dev/null
@@ -1 +0,0 @@
-../smallnumbers-activity
\ No newline at end of file
diff --git a/src/wordsgame-activity/readingh-activity b/src/wordsgame-activity/readingh-activity
deleted file mode 120000
index 4a840f4..0000000
--- a/src/wordsgame-activity/readingh-activity
+++ /dev/null
@@ -1 +0,0 @@
-../readingh-activity
\ No newline at end of file
--
1.6.5.3
More information about the Gcompris-devel
mailing list