diff --git a/mk/linux/makedata.sh b/mk/linux/makedata.sh index 2c66fcc7..6e67b8bc 100755 --- a/mk/linux/makedata.sh +++ b/mk/linux/makedata.sh @@ -14,19 +14,42 @@ echo "Creating data package in $RELEASEDIR" mkdir -p "$RELEASEDIR" # copy data -cp "$CURRENTDIR/../../mk/linux/megaglest.bmp" $RELEASEDIR -cp "$CURRENTDIR/../../mk/linux/megaglest.desktop" $RELEASEDIR -cp "$CURRENTDIR/../../mk/linux/megaglest.png" $RELEASEDIR -cp "$CURRENTDIR/../../mk/linux/glest.ico" $RELEASEDIR -cp "$CURRENTDIR/../../mk/linux/configuration.xml" $RELEASEDIR +#cp "$CURRENTDIR/../../mk/linux/megaglest.bmp" $RELEASEDIR +svn export --force "$CURRENTDIR/../../mk/linux/megaglest.bmp" "$RELEASEDIR/megaglest.bmp" + +#cp "$CURRENTDIR/../../mk/linux/megaglest.desktop" $RELEASEDIR +svn export --force "$CURRENTDIR/../../mk/linux/megaglest.desktop" "$RELEASEDIR/megaglest.desktop" + +#cp "$CURRENTDIR/../../mk/linux/megaglest.png" $RELEASEDIR +svn export --force "$CURRENTDIR/../../mk/linux/megaglest.png" "$RELEASEDIR/megaglest.png" + +#cp "$CURRENTDIR/../../mk/linux/glest.ico" $RELEASEDIR +svn export --force "$CURRENTDIR/../../mk/linux/glest.ico" "$RELEASEDIR/glest.ico" + +#cp "$CURRENTDIR/../../mk/linux/configuration.xml" $RELEASEDIR +svn export --force "$CURRENTDIR/../../mk/linux/configuration.xml" "$RELEASEDIR/configuration.xml" + +#cp "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR +svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" "$RELEASEDIR/megaglest.ico" + +#cp "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR +svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" "$RELEASEDIR/g3dviewer.ico" + +#cp "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR +svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" "$RELEASEDIR/editor.ico" + +#cp "$CURRENTDIR/../../data/glest_game/servers.ini" $RELEASEDIR +svn export --force "$CURRENTDIR/../../data/glest_game/servers.ini" "$RELEASEDIR/servers.ini" + +#cp "$CURRENTDIR/../../data/glest_game/glest.ini" $RELEASEDIR/glest_windows.ini +svn export --force "$CURRENTDIR/../../data/glest_game/glest.ini" "$RELEASEDIR/glest_windows.ini" + +#cp "$CURRENTDIR/../../mk/linux/glest.ini" $RELEASEDIR/glest_linux.ini +svn export --force "$CURRENTDIR/../../mk/linux/glest.ini" "$RELEASEDIR/glest_linux.ini" + +#cp "$CURRENTDIR/../../data/glest_game/glestkeys.ini" $RELEASEDIR +svn export --force "$CURRENTDIR/../../data/glest_game/glestkeys.ini" "$RELEASEDIR/glestkeys.ini" -cp "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR -cp "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR -cp "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR -cp "$CURRENTDIR/../../data/glest_game/servers.ini" $RELEASEDIR -cp "$CURRENTDIR/../../data/glest_game/glest.ini" $RELEASEDIR/glest_windows.ini -cp "$CURRENTDIR/../../mk/linux/glest.ini" $RELEASEDIR/glest_linux.ini -cp "$CURRENTDIR/../../data/glest_game/glestkeys.ini" $RELEASEDIR #cp "$CURRENTDIR/../../data/glest_game/configuration.xml" $RELEASEDIR mkdir -p "$RELEASEDIR/data/" @@ -48,7 +71,8 @@ svn export --force "$CURRENTDIR/../../data/glest_game/tutorials" "$RELEASEDIR/tu mkdir -p "$RELEASEDIR/data/core/misc_textures/flags/" svn export --force "$CURRENTDIR/../../source/masterserver/flags" "$RELEASEDIR/data/core/misc_textures/flags/" -cp -p "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" $RELEASEDIR +#cp -p "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" $RELEASEDIR +svn export --force "$CURRENTDIR/../../data/glest_game/CMakeLists.txt" "$RELEASEDIR/CMakeLists.txt" echo "creating $PACKAGE" [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE" diff --git a/mk/linux/makerelease.sh b/mk/linux/makerelease.sh index 1b543af9..3fdc62a1 100755 --- a/mk/linux/makerelease.sh +++ b/mk/linux/makerelease.sh @@ -14,32 +14,52 @@ mkdir -p "$RELEASEDIR" svn export --force "$SOURCEDIR" "$RELEASEDIR/source" -#cp -r "$CURRENTDIR/../cmake/" "$RELEASEDIR" -#cp -r "$CURRENTDIR/../macosx/" "$RELEASEDIR" -#cp -r "$CURRENTDIR/../../docs" $RELEASEDIR -#cp "$CURRENTDIR/"*.ini $RELEASEDIR -#cp "$CURRENTDIR/glest.ico" $RELEASEDIR -#cp "$CURRENTDIR/megaglest.png" $RELEASEDIR -#cp "$CURRENTDIR/megaglest.desktop" $RELEASEDIR -#cp "$CURRENTDIR/start_megaglest"* $RELEASEDIR -#cp "$CURRENTDIR/../../CMake"* $RELEASEDIR mkdir -p "$RELEASEDIR/mk/cmake/" svn export --force "$CURRENTDIR/../cmake/" "$RELEASEDIR/mk/cmake/" mkdir -p "$RELEASEDIR/mk/macosx/" svn export --force "$CURRENTDIR/../macosx/" "$RELEASEDIR/mk/macosx/" -svn export --force "$CURRENTDIR/../../docs" $RELEASEDIR -cp "$CURRENTDIR/"*.ini $RELEASEDIR -cp "$CURRENTDIR/glest.ico" $RELEASEDIR -cp "$CURRENTDIR/megaglest.bmp" $RELEASEDIR -cp "$CURRENTDIR/megaglest.png" $RELEASEDIR -cp "$CURRENTDIR/megaglest.desktop" $RELEASEDIR -cp "$CURRENTDIR/megaglest.6" $RELEASEDIR -cp "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR -cp "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR -cp "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR +mkdir -p "$RELEASEDIR/mk/windoze/" +svn export --force "$CURRENTDIR/../windoze/" "$RELEASEDIR/mk/windoze/" -cp "$CURRENTDIR/start_megaglest"* $RELEASEDIR -cp "$CURRENTDIR/../../CMake"* $RELEASEDIR +svn export --force "$CURRENTDIR/../../docs" $RELEASEDIR + +#cp "$CURRENTDIR/"*.ini $RELEASEDIR +svn export --force "$CURRENTDIR/glest.ini" $RELEASEDIR/glest.ini +svn export --force "$CURRENTDIR/glestkeys.ini" $RELEASEDIR/glestkeys.ini +svn export --force "$CURRENTDIR/servers.ini" $RELEASEDIR/servers.ini + +#cp "$CURRENTDIR/glest.ico" $RELEASEDIR +svn export --force "$CURRENTDIR/glest.ico" $RELEASEDIR/glest.ico + +#cp "$CURRENTDIR/megaglest.bmp" $RELEASEDIR +svn export --force "$CURRENTDIR/megaglest.bmp" $RELEASEDIR/megaglest.bmp + +#cp "$CURRENTDIR/megaglest.png" $RELEASEDIR +svn export --force "$CURRENTDIR/megaglest.png" $RELEASEDIR/megaglest.png + +#cp "$CURRENTDIR/megaglest.desktop" $RELEASEDIR +svn export --force "$CURRENTDIR/megaglest.desktop" $RELEASEDIR/megaglest.desktop + +#cp "$CURRENTDIR/megaglest.6" $RELEASEDIR +svn export --force "$CURRENTDIR/megaglest.6" $RELEASEDIR/megaglest.6 + +#cp "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR +svn export --force "$CURRENTDIR/../../data/glest_game/megaglest.ico" $RELEASEDIR/megaglest.ico + +#cp "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR +svn export --force "$CURRENTDIR/../../data/glest_game/g3dviewer.ico" $RELEASEDIR/g3dviewer.ico + +#cp "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR +svn export --force "$CURRENTDIR/../../data/glest_game/editor.ico" $RELEASEDIR/editor.ico + +#cp "$CURRENTDIR/start_megaglest"* $RELEASEDIR +svn export --force "$CURRENTDIR/start_megaglest" $RELEASEDIR/start_megaglest +svn export --force "$CURRENTDIR/start_megaglest_configurator" $RELEASEDIR/start_megaglest_configurator +svn export --force "$CURRENTDIR/start_megaglest_g3dviewer" $RELEASEDIR/start_megaglest_g3dviewer +svn export --force "$CURRENTDIR/start_megaglest_mapeditor" $RELEASEDIR/start_megaglest_mapeditor + +#cp "$CURRENTDIR/../../CMake"* $RELEASEDIR +svn export --force "$CURRENTDIR/../../CMakeLists.txt" $RELEASEDIR/CMakeLists.txt echo "Creating $PACKAGE" [[ -f "$release/$PACKAGE" ]] && rm "release/$PACKAGE"