improved release scripts

release.sh

@@ -1,20 +1,33 @@
-TMP="/tmp/cmclient_release"
+TMP="/tmp/cmclient"
 WIN="/var/run/media/pavels/F8040EC2040E843A/novattd"
-rm -rf $TMP
-echo $TMP
-mkdir $TMP
-unzip -d $TMP release.zip
-cp -r $WIN/bin/lang $TMP
-cp nova_changelog.txt $TMP/changelog.txt
-rm $TMP/nova*.diff
-rm $TMP/citymania*.diff
-cp citymania151.diff $TMP
+VER="1.5.1"
+CMVER="1.5.1"
+TMP_SRC="$TMP/openttd-$VER"
 DIR=`pwd`
-pushd $TMP
+SRC_RELEASE_FNAME="$DIR/citymania-client-$CMVER-source.zip"
+RELEASE_FNAME="$DIR/citymania-client-$CMVER-win32.zip"
+RELEASE64_FNAME="$DIR/citymania-client-$CMVER-win64.zip"
+rm $SRC_RELEASE_FNAME
+rm $RELEASE_FNAME
+rm $RELEASE64_FNAME
+rm -rf $TMP
+mkdir $TMP
+hg diff -r openttd -B --nodates -X release_files -X make_diff.sh -X release.sh -X check_diff.sh -X novattd.sublime-project -X src/rev.cpp -X .hgignore -X src/rev.cpp.in -X Makefile.src.in -X build-number.txt > $TMP/cmclient.diff
+tar xf ~/Downloads/openttd-$VER-source.tar.* -C $TMP
+patch -p1 -d $TMP_SRC < $TMP/cmclient.diff
+pushd $TMP_SRC
+zip -9 -r $SRC_RELEASE_FNAME *
+./configure
+make lang
+popd
+unzip ~/Downloads/openttd-$VER-windows-win32.zip -d $TMP/release
+mkdir $TMP/release/data
+cp -r $TMP_SRC/bin/lang $TMP/release/
+cp -r $DIR/release_files/* $TMP/release/
+cp $DIR/cm_changelog.txt $TMP/release/citymania_changelog.txt
+pushd $TMP/release
 cp $WIN/bin/openttd.exe openttd.exe
-rm $DIR/novapolis_client.zip
-zip -9 -r $DIR/citymania_openttd.zip *
+zip -9 -r $RELEASE_FNAME *
 cp $WIN/bin/openttd64.exe openttd.exe
-rm $DIR/novapolis_client_64.zip
-zip -9 -r $DIR/citymania_openttd_64.zip *
-popd
+zip -9 -r $RELEASE64_FNAME *
+popd