From 9ae185e37bcaa2f406bfe016f8261ad8b00c68c7 Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Thu, 25 Sep 2014 00:48:39 +0200 Subject: [PATCH 1/3] add shared ini's when packaging bin's --- data/glest_game | 2 +- mk/linux/make-binary-archive.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/glest_game b/data/glest_game index cfb41238..4f05a017 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit cfb41238ad446318b6dda34adba700194a5037c6 +Subproject commit 4f05a0177385ce47eb4cfcf5ce6676f59b290d37 diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh index 5a4974a2..a4fd0cf7 100755 --- a/mk/linux/make-binary-archive.sh +++ b/mk/linux/make-binary-archive.sh @@ -54,11 +54,11 @@ fi cd $PROJDIR echo "copying binaries ..." cp -r lib/* "$RELEASEDIR/lib" -cp *.ico "$RELEASEDIR/" -cp *.bmp "$RELEASEDIR/" -cp *.png "$RELEASEDIR/" -cp *.xpm "$RELEASEDIR/" -cp *.ini "$RELEASEDIR/" +cp {mk/shared/,}*.ico "$RELEASEDIR/" +cp {mk/shared/,}*.bmp "$RELEASEDIR/" +cp {mk/shared/,}*.png "$RELEASEDIR/" +cp {mk/shared/,}*.xpm "$RELEASEDIR/" +cp {mk/shared/,}*.ini "$RELEASEDIR/" cp megaglest "$RELEASEDIR/" cp megaglest_editor "$RELEASEDIR/" cp megaglest_g3dviewer "$RELEASEDIR/" From 2738169c6b57017619f131209fda69585a757d7e Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Thu, 25 Sep 2014 02:09:16 +0200 Subject: [PATCH 2/3] Another try... --- mk/linux/make-binary-archive.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh index a4fd0cf7..1c70f86b 100755 --- a/mk/linux/make-binary-archive.sh +++ b/mk/linux/make-binary-archive.sh @@ -54,11 +54,11 @@ fi cd $PROJDIR echo "copying binaries ..." cp -r lib/* "$RELEASEDIR/lib" -cp {mk/shared/,}*.ico "$RELEASEDIR/" -cp {mk/shared/,}*.bmp "$RELEASEDIR/" -cp {mk/shared/,}*.png "$RELEASEDIR/" -cp {mk/shared/,}*.xpm "$RELEASEDIR/" -cp {mk/shared/,}*.ini "$RELEASEDIR/" +cp {../shared/,}*.ico "$RELEASEDIR/" +cp {../shared/,}*.bmp "$RELEASEDIR/" +cp {../shared/,}*.png "$RELEASEDIR/" +cp {../shared/,}*.xpm "$RELEASEDIR/" +cp {../shared/,}*.ini "$RELEASEDIR/" cp megaglest "$RELEASEDIR/" cp megaglest_editor "$RELEASEDIR/" cp megaglest_g3dviewer "$RELEASEDIR/" From 30d362652d6edfd61e0b24675a45b68a6b4d68f9 Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Thu, 25 Sep 2014 02:22:57 +0200 Subject: [PATCH 3/3] And another... --- mk/linux/make-binary-archive.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh index 1c70f86b..5c9bb4c9 100755 --- a/mk/linux/make-binary-archive.sh +++ b/mk/linux/make-binary-archive.sh @@ -55,9 +55,9 @@ cd $PROJDIR echo "copying binaries ..." cp -r lib/* "$RELEASEDIR/lib" cp {../shared/,}*.ico "$RELEASEDIR/" -cp {../shared/,}*.bmp "$RELEASEDIR/" -cp {../shared/,}*.png "$RELEASEDIR/" -cp {../shared/,}*.xpm "$RELEASEDIR/" +cp *.bmp "$RELEASEDIR/" +cp *.png "$RELEASEDIR/" +cp *.xpm "$RELEASEDIR/" cp {../shared/,}*.ini "$RELEASEDIR/" cp megaglest "$RELEASEDIR/" cp megaglest_editor "$RELEASEDIR/"