diff --git a/binary/program32/AIORuntimes.exe b/binary/program32/AIORuntimes.exe index f03ad96..650bf44 100755 Binary files a/binary/program32/AIORuntimes.exe and b/binary/program32/AIORuntimes.exe differ diff --git a/binary/system32/AIORuntimes.dll b/binary/system32/AIORuntimes.dll index e0195ca..78eefd0 100755 Binary files a/binary/system32/AIORuntimes.dll and b/binary/system32/AIORuntimes.dll differ diff --git a/build.sh b/build.sh index 53b74c8..f5ded6f 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/sh -VERSION="1.1.0.1" +VERSION="1.1.0.2" KELSRUN="8.6.2" LEGACYRUN="1_0_0" RICKRUN="2_2_2" @@ -20,7 +20,7 @@ OPENSSLVER="1_0_1e" SDL1VER="1.2.15" SDL2VER="2.0.0" -ADVINSTPATH=/cygdrive/c/Programme/Caphyon/Advanced\ Installer\ 10.3/bin/x86/ +ADVINSTPATH=/cygdrive/c/Programme/Caphyon/Advanced\ Installer\ 10.5/bin/x86/ OUT=$(mktemp -d /tmp/output.XXXXXXXXXX) || { echo "Failed to create temp dir"; exit 1; } @@ -648,16 +648,19 @@ for i in $PWD/binary/system16/* do echo "$(cygpath -pw "$i")" AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /AddFile System16Folder "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /RegisterFile System16Folder\\`basename "$i"` -registration_type Auto done for i in $PWD/binary/system32/* do echo "$(cygpath -pw "$i")" AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /AddFile SystemFolder "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /RegisterFile SystemFolder\\`basename "$i"` -registration_type Auto done for i in $PWD/binary/system64/* do echo "$(cygpath -pw "$i")" AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /AddFile System64Folder "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /RegisterFile System64Folder\\`basename "$i"` -registration_type Auto done for i in $PWD/binary/program32/* do @@ -682,7 +685,8 @@ rm -rf $OUT # ============================================================================================= # Sync the releases # ============================================================================================= -rsync -avz -e ssh $PWD/release/en/* root@213.145.233.54:/home/ftp/AIO +#rsync -avz -e ssh $PWD/release/en/* root@213.145.233.54:/home/ftp/AIO +rsync -avz -e ssh $PWD/release/en/* root@192.168.11.129:/home/mario/mars/ftp/mars/AIO diff --git a/code/go-runtime.aip b/code/go-runtime.aip index 6a3f2ef..72a74af 100755 --- a/code/go-runtime.aip +++ b/code/go-runtime.aip @@ -1,6 +1,7 @@ - + + @@ -8,14 +9,16 @@ - + - - + + + + @@ -54,9 +57,6 @@ - - - @@ -83,6 +83,7 @@ + @@ -101,11 +102,13 @@ - - + + + - + + diff --git a/create.sh b/create.sh new file mode 100755 index 0000000..481e35a --- /dev/null +++ b/create.sh @@ -0,0 +1,91 @@ +#!/bin/sh +VERSION="1.1.0.2" +KELSRUN="8.6.2" +LEGACYRUN="1_0_0" +RICKRUN="2_2_2" +CYGVER="1.7.24-1" +ZLIBVER="128" +ZLIBWAPIVER="125" +VB1VER="100" +VB2VER="200" +VB3VER="300" +VB4VER="400" +VB5VER="50" +VB6VER="60sp6" +VC1VER="10" +VC2002VER="70sp1" +VC2003VER="71sp1" +AUTOITVER="3.3.9.19" +OPENSSLVER="1_0_1e" +SDL1VER="1.2.15" +SDL2VER="2.0.0" + +ADVINSTPATH=/cygdrive/c/Programme/Caphyon/Advanced\ Installer\ 10.5/bin/x86/ + +OUT=$(mktemp -d /tmp/output.XXXXXXXXXX) || { echo "Failed to create temp dir"; exit 1; } + + +# ============================================================================================= +# Build the MSI +# ============================================================================================= +rm $PWD/*.aip +cp -vf $PWD/code/go-runtime.aip $PWD/go-runtime.aip + +OLDPATH=$PATH +export PATH=$ADVINSTPATH:$PATH + +echo $PATH +echo "$(cygpath -pw "$PWD/go-runtime.aip")" + +AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /SetVersion $VERSION + +# copy after verison change this will correct the update for the next release +# advinst will create a new msiid that will be updated from releas to release +cp -vf $PWD/go-runtime.aip $PWD/code/go-runtime.aip + +for i in $PWD/binary/system16/* +do + echo "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /AddFile System16Folder "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /RegisterFile System16Folder\\`basename "$i"` -registration_type Auto +done +for i in $PWD/binary/system32/* +do + echo "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /AddFile SystemFolder "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /RegisterFile SystemFolder\\`basename "$i"` -registration_type Auto +done +for i in $PWD/binary/system64/* +do + echo "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /AddFile System64Folder "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /RegisterFile System64Folder\\`basename "$i"` -registration_type Auto +done +for i in $PWD/binary/program32/* +do + echo "$(cygpath -pw "$i")" + AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /AddFile APPDIR "$(cygpath -pw "$i")" +done + +echo "$(cygpath -pw "$PWD/release")" + +AdvancedInstaller.com /edit "$(cygpath -pw "$PWD/go-runtime.aip")" /SetOutputLocation -buildname DefaultBuild -path "$(cygpath -pw "$PWD/release")" +AdvancedInstaller.com /rebuild "$(cygpath -pw "$PWD/go-runtime.aip")" + +rm $PWD/*.aip + +export PATH=$OLDPATH + +# ============================================================================================= +# Delete Temp Dirs +# ============================================================================================= +rm -rf $OUT + +# ============================================================================================= +# Sync the releases +# ============================================================================================= +#rsync -avz -e ssh $PWD/release/en/* root@213.145.233.54:/home/ftp/AIO +rsync -avz -e ssh $PWD/release/en/* root@192.168.11.129:/home/mario/mars/ftp/mars/AIO + + + diff --git a/go-runtime-cache/cacheIndex.txt b/go-runtime-cache/cacheIndex.txt new file mode 100755 index 0000000..d2ea06d Binary files /dev/null and b/go-runtime-cache/cacheIndex.txt differ diff --git a/go-runtime-cache/part1/disk1.cab b/go-runtime-cache/part1/disk1.cab new file mode 100755 index 0000000..c408e66 Binary files /dev/null and b/go-runtime-cache/part1/disk1.cab differ diff --git a/go-runtime-cache/part1/output-info.ini b/go-runtime-cache/part1/output-info.ini new file mode 100755 index 0000000..818c00d Binary files /dev/null and b/go-runtime-cache/part1/output-info.ini differ diff --git a/go-runtime-cache/part2/disk1.cab b/go-runtime-cache/part2/disk1.cab new file mode 100755 index 0000000..f6c8c93 Binary files /dev/null and b/go-runtime-cache/part2/disk1.cab differ diff --git a/go-runtime-cache/part2/output-info.ini b/go-runtime-cache/part2/output-info.ini new file mode 100755 index 0000000..4131907 Binary files /dev/null and b/go-runtime-cache/part2/output-info.ini differ diff --git a/release/en/Geos_One_General_Runtimes_Installer_1.1.0.0.msi b/release/en/Geos_One_General_Runtimes_Installer_1.1.0.0.msi new file mode 100755 index 0000000..b6a975f Binary files /dev/null and b/release/en/Geos_One_General_Runtimes_Installer_1.1.0.0.msi differ diff --git a/release/en/Geos_One_General_Runtimes_Installer_1.1.0.1.msi b/release/en/Geos_One_General_Runtimes_Installer_1.1.0.1.msi new file mode 100755 index 0000000..eccf55b Binary files /dev/null and b/release/en/Geos_One_General_Runtimes_Installer_1.1.0.1.msi differ diff --git a/release/en/Geos_One_General_Runtimes_Installer_1.1.0.2.msi b/release/en/Geos_One_General_Runtimes_Installer_1.1.0.2.msi new file mode 100755 index 0000000..826cc3d Binary files /dev/null and b/release/en/Geos_One_General_Runtimes_Installer_1.1.0.2.msi differ