diff --git a/cm_changelog.txt b/cm_changelog.txt index 8b643e9002..05fa964def 100644 --- a/cm_changelog.txt +++ b/cm_changelog.txt @@ -5,6 +5,10 @@ Unless you encouter the same bug on unpatched OpenTTD client do not report it to == INSTALL == +Unlike Novapolis client Citymania one is shipped as a complete package, not +just a patch, so it no longer needs vanila OpenTTD installation to work. +But it can also be installed in the same old way described below. + If you have shared OpenTTD folder, you can just unzip anywhere and launch If you dont use shared folder, unzip into your OpenTTD folder innerhighlight.grf in data folder is required, copy it to data or content_download/data folder @@ -26,7 +30,7 @@ Possible situations: Copy all files except LANG folder and OPENTTD.EXE into User profile folder called OpenTTD This will enable you to use any number or openttd versions/clients under condition you keep openttd.exe and its lang files in one folder (every client comes with binary and lang folder at least) LINUX -CityMania does not ship linux client. Your only chance is to compile it by yourself. +CityMania does not ship linux client. Your only chance is to download source package and compile it by yourself. Process is easy and simple guide is at http://wiki.openttd.org/Compiling_on_(GNU/)Linux_and_*BSD @@ -69,12 +73,12 @@ This is usable for any OpenTTD servers == CHANGELOG == -*** v28-151 TODO date*** -- Renamed to CityMania client as successor of Novapolis, all community-related things changed accordingly. -- TODO Ship full openttd version, not just patch that requires original ttd +*** v28-151 (3 Jun 2015)*** +- Renamed to CityMania client as successor of Novapolis, community-related things changed accordingly. +- Now is shipped in a complete package, similar to vanila OpenTTD, so no longer require it to be installed first. - Providing complete source pack instead of just diff -- Show houses count in town gui, town can be sorted by it too. -- TODO 1.5.1 cb changes +- Also note that town growth mechanics is changed a bit in 1.5.1. It's now safe (no CS) to keep depots and extra roadbits in town. And previously HS cases become CS. Now HS can only happen when town is allowed to build roads and decides to build one instead of house. +- Show houses count in towns list, towns can be sorted by it too. *** v27-150 *** - Land info tool works as tooltip, can also be used to mesure distances by dragging diff --git a/release.sh b/release.sh index 66b51cf986..c52d6c94d1 100755 --- a/release.sh +++ b/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 \ No newline at end of file +zip -9 -r $RELEASE64_FNAME * +popd