From 1c32e7284bd315da41739c8b19fb2a2fae96fb9a Mon Sep 17 00:00:00 2001 From: xPaw Date: Sun, 27 Jul 2014 11:02:06 +0300 Subject: [PATCH 1/9] Fix package script copying wrong amxmodx_version file to include folder --- support/PackageScript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/PackageScript b/support/PackageScript index ff5fd354..fc2822b6 100644 --- a/support/PackageScript +++ b/support/PackageScript @@ -120,7 +120,7 @@ for amxx_file in AMXX.plugins: # Copy the generated version .inc. for generated_header in AMXX.generated_headers: - if 'inc' in generated_header.path: + if os.path.splitext(generated_header.path)[1] == 'inc': builder.AddCopy(generated_header, folder_map['base/addons/amxmodx/scripting/include']) break From 9d0ea883ff72b822c877eb86cbae5d2a68d104bb Mon Sep 17 00:00:00 2001 From: xPaw Date: Sun, 27 Jul 2014 11:04:17 +0300 Subject: [PATCH 2/9] Ignore compiled plugins --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index be789879..299d9b6c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,7 @@ Thumbs.db # Build directories build/ obj-*/ + +# AMXX plugin build related files +plugins/compile.dat +plugins/compiled/ From 57a1004c159416ec34074f6fa4716a13ae03e96a Mon Sep 17 00:00:00 2001 From: xPaw Date: Sun, 27 Jul 2014 11:07:13 +0300 Subject: [PATCH 3/9] Replace svn_version with default amxmodx_version which should get replaced by AMBuild regardless --- plugins/include/amxconst.inc | 2 +- plugins/include/amxmodx_version.inc | 16 ++++++++++++++++ plugins/include/svn_version.inc | 19 ------------------- 3 files changed, 17 insertions(+), 20 deletions(-) create mode 100644 plugins/include/amxmodx_version.inc delete mode 100644 plugins/include/svn_version.inc diff --git a/plugins/include/amxconst.inc b/plugins/include/amxconst.inc index 54569483..5fe43457 100755 --- a/plugins/include/amxconst.inc +++ b/plugins/include/amxconst.inc @@ -11,7 +11,7 @@ #endif #define _amxconst_included -#include +#include /** * This is the buffer size AMX Mod X uses internally to retrieve strings from plugins. diff --git a/plugins/include/amxmodx_version.inc b/plugins/include/amxmodx_version.inc new file mode 100644 index 00000000..a66c3732 --- /dev/null +++ b/plugins/include/amxmodx_version.inc @@ -0,0 +1,16 @@ +/* AMX Mod X constants +* +* by the AMX Mod X Development Team +* originally developed by OLO +* +* This file is provided as is (no warranties). +*/ + +#if defined _amxmodx_version_included + #endinput +#endif +#define _amxmodx_version_included + +#define AMXX_VERSION 0 +#define AMXX_VERSION_NUM 0 +stock const AMXX_VERSION_STR[] = "AMBuild failed?"; diff --git a/plugins/include/svn_version.inc b/plugins/include/svn_version.inc deleted file mode 100644 index d609cebc..00000000 --- a/plugins/include/svn_version.inc +++ /dev/null @@ -1,19 +0,0 @@ -/* AMX Mod X constants -* -* by the AMX Mod X Development Team -* originally developed by OLO -* -* This file is provided as is (no warranties). -*/ - -#if defined _svnversion_included - #endinput -#endif -#define _svnversion_included - -#tryinclude -#if !defined _amxmodx_version_included - #define AMXX_VERSION 1.83 - #define AMXX_VERSION_NUM 183 - stock const AMXX_VERSION_STR[] = "1.8.3-dev"; -#endif From 868be370074fb72496096a55806fb59ba5e99157 Mon Sep 17 00:00:00 2001 From: xPaw Date: Sun, 27 Jul 2014 11:09:15 +0300 Subject: [PATCH 4/9] Remove svn_version.inc from package script --- installer/amxmodx-installer.nsi | 4 ++-- support/PackageScript | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/installer/amxmodx-installer.nsi b/installer/amxmodx-installer.nsi index e60ce396..56861e97 100755 --- a/installer/amxmodx-installer.nsi +++ b/installer/amxmodx-installer.nsi @@ -230,6 +230,7 @@ Section "MainSection" SEC01 File "installer\files\base\addons\amxmodx\scripting\include\amxconst.inc" File "installer\files\base\addons\amxmodx\scripting\include\amxmisc.inc" File "installer\files\base\addons\amxmodx\scripting\include\amxmodx.inc" + File "installer\files\base\addons\amxmodx\scripting\include\amxmodx_version.inc" File "installer\files\base\addons\amxmodx\scripting\include\cellarray.inc" File "installer\files\base\addons\amxmodx\scripting\include\celltrie.inc" File "installer\files\base\addons\amxmodx\scripting\include\core.inc" @@ -271,7 +272,6 @@ Section "MainSection" SEC01 File "installer\files\base\addons\amxmodx\scripting\include\sorting.inc" File "installer\files\base\addons\amxmodx\scripting\include\sqlx.inc" File "installer\files\base\addons\amxmodx\scripting\include\string.inc" - File "installer\files\base\addons\amxmodx\scripting\include\svn_version.inc" File "installer\files\base\addons\amxmodx\scripting\include\tfcconst.inc" File "installer\files\base\addons\amxmodx\scripting\include\tfcstats.inc" File "installer\files\base\addons\amxmodx\scripting\include\tfcx.inc" @@ -633,7 +633,6 @@ Section Uninstall Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\tfcstats.inc" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\tfcconst.inc" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\time.inc" - Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\svn_version.inc" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\string.inc" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\sqlx.inc" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\sorting.inc" @@ -678,6 +677,7 @@ Section Uninstall Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmod.inc" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmisc.inc" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxconst.inc" + Delete "$INSTDIR\files\base\addons\amxmodx\scripting\include\amxmodx_version.inc" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\timeleft.sma" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\telemenu.sma" Delete "$INSTDIR\files\base\addons\amxmodx\scripting\statscfg.sma" diff --git a/support/PackageScript b/support/PackageScript index fc2822b6..45ca2beb 100644 --- a/support/PackageScript +++ b/support/PackageScript @@ -286,7 +286,6 @@ scripting_files = [ 'include/newmenus.inc', 'include/sorting.inc', 'include/sqlx.inc', - 'include/svn_version.inc', 'include/time.inc', 'include/vector.inc', ] From c5ba642630b2f92225aa851002694494cf6cf6e6 Mon Sep 17 00:00:00 2001 From: xPaw Date: Sun, 27 Jul 2014 11:43:50 +0300 Subject: [PATCH 5/9] Change zeroes to manual in predefined version.inc --- plugins/include/amxmodx_version.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/include/amxmodx_version.inc b/plugins/include/amxmodx_version.inc index a66c3732..0873513c 100644 --- a/plugins/include/amxmodx_version.inc +++ b/plugins/include/amxmodx_version.inc @@ -11,6 +11,6 @@ #endif #define _amxmodx_version_included -#define AMXX_VERSION 0 -#define AMXX_VERSION_NUM 0 -stock const AMXX_VERSION_STR[] = "AMBuild failed?"; +#define AMXX_VERSION 1.83 +#define AMXX_VERSION_NUM 183 +stock const AMXX_VERSION_STR[] = "1.8.3-manual"; From 5d85c0a965ab38d1cffdb6a641285705fabdb324 Mon Sep 17 00:00:00 2001 From: xPaw Date: Sun, 27 Jul 2014 11:59:49 +0300 Subject: [PATCH 6/9] Update VS references to amxmodx_version.inc --- amxmodx/msvc10/amxmodx_mm.vcxproj | 2 +- amxmodx/msvc10/amxmodx_mm.vcxproj.filters | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amxmodx/msvc10/amxmodx_mm.vcxproj b/amxmodx/msvc10/amxmodx_mm.vcxproj index c7d86407..6ac4c6a8 100644 --- a/amxmodx/msvc10/amxmodx_mm.vcxproj +++ b/amxmodx/msvc10/amxmodx_mm.vcxproj @@ -412,6 +412,7 @@ + @@ -423,7 +424,6 @@ - diff --git a/amxmodx/msvc10/amxmodx_mm.vcxproj.filters b/amxmodx/msvc10/amxmodx_mm.vcxproj.filters index 33d5c600..52024ad9 100644 --- a/amxmodx/msvc10/amxmodx_mm.vcxproj.filters +++ b/amxmodx/msvc10/amxmodx_mm.vcxproj.filters @@ -360,6 +360,9 @@ Pawn Includes + + Pawn Includes + Pawn Includes @@ -387,9 +390,6 @@ Pawn Includes - - Pawn Includes - Pawn Includes From a6f10efd03ad34afe1ecea000073e9cca831b0d4 Mon Sep 17 00:00:00 2001 From: xPaw Date: Sun, 27 Jul 2014 12:11:44 +0300 Subject: [PATCH 7/9] splitext didn't work --- support/PackageScript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/PackageScript b/support/PackageScript index 45ca2beb..f870ade3 100644 --- a/support/PackageScript +++ b/support/PackageScript @@ -120,7 +120,7 @@ for amxx_file in AMXX.plugins: # Copy the generated version .inc. for generated_header in AMXX.generated_headers: - if os.path.splitext(generated_header.path)[1] == 'inc': + if 'amxmodx_version.inc' in generated_header.path: builder.AddCopy(generated_header, folder_map['base/addons/amxmodx/scripting/include']) break From fae6c520825e87687b46916c5afb4cb43df8ee3d Mon Sep 17 00:00:00 2001 From: xPaw Date: Sun, 27 Jul 2014 12:17:07 +0300 Subject: [PATCH 8/9] Don't build mysql module with travis because every time it runs, it downloads full mysql sourcecode --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d023c0e..ad385feb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,5 @@ before_script: - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh && cd $CHECKOUT_DIR script: - mkdir build && cd build - - python ../configure.py --enable-optimize + - python ../configure.py --enable-optimize --no-mysql - ambuild From f2b1d26da3d604a960c117c032d1759576390f04 Mon Sep 17 00:00:00 2001 From: xPaw Date: Sun, 27 Jul 2014 12:31:19 +0300 Subject: [PATCH 9/9] Add --no-mysql to checkout-deps.sh --- .travis.yml | 2 +- support/checkout-deps.sh | 76 +++++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index ad385feb..73378cfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ compiler: before_script: - sudo apt-get update -qq - sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev - - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh && cd $CHECKOUT_DIR + - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh --no-mysql && cd $CHECKOUT_DIR script: - mkdir build && cd build - python ../configure.py --enable-optimize --no-mysql diff --git a/support/checkout-deps.sh b/support/checkout-deps.sh index 90e6c4c9..542c7c89 100755 --- a/support/checkout-deps.sh +++ b/support/checkout-deps.sh @@ -1,49 +1,51 @@ #!/usr/bin/env bash trap "exit" INT -ismac=0 -iswin=0 - -archive_ext=tar.gz -decomp="tar zxf" - -if [ `uname` = "Darwin" ]; then - ismac=1 -elif [ `uname` != "Linux" ] && [ -n "${COMSPEC:+1}" ]; then - iswin=1 - archive_ext=zip - decomp=unzip -fi - if [ ! -d "amxmodx" ]; then git clone https://github.com/alliedmodders/amxmodx.git fi -if [ $ismac -eq 1 ]; then - mysqlver=mysql-5.5.28-osx10.5-x86 - mysqlurl=http://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext -elif [ $iswin -eq 1 ]; then - mysqlver=mysql-noinstall-5.0.24a-win32 - mysqlurl=http://cdn.mysql.com/archives/mysql-5.0/$mysqlver.$archive_ext - # The folder in the zip archive does not contain the substring "-noinstall", so strip it - mysqlver=${mysqlver/-noinstall} -else - mysqlver=mysql-5.6.15-linux-glibc2.5-i686 - mysqlurl=http://cdn.mysql.com/archives/mysql-5.6/$mysqlver.$archive_ext -fi +if [ "$1" != "--no-mysql" ]; then + ismac=0 + iswin=0 -if [ ! -d "mysql-5.0" ]; then - if [ `command -v wget` ]; then - wget $mysqlurl -O mysql.$archive_ext - elif [ `command -v curl` ]; then - curl -o mysql.$archive_ext $mysqlurl - else - echo "Failed to locate wget or curl. Install one of these programs to download MySQL." - exit 1 + archive_ext=tar.gz + decomp="tar zxf" + + if [ `uname` = "Darwin" ]; then + ismac=1 + elif [ `uname` != "Linux" ] && [ -n "${COMSPEC:+1}" ]; then + iswin=1 + archive_ext=zip + decomp=unzip + fi + + if [ $ismac -eq 1 ]; then + mysqlver=mysql-5.5.28-osx10.5-x86 + mysqlurl=http://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext + elif [ $iswin -eq 1 ]; then + mysqlver=mysql-noinstall-5.0.24a-win32 + mysqlurl=http://cdn.mysql.com/archives/mysql-5.0/$mysqlver.$archive_ext + # The folder in the zip archive does not contain the substring "-noinstall", so strip it + mysqlver=${mysqlver/-noinstall} + else + mysqlver=mysql-5.6.15-linux-glibc2.5-i686 + mysqlurl=http://cdn.mysql.com/archives/mysql-5.6/$mysqlver.$archive_ext + fi + + if [ ! -d "mysql-5.0" ]; then + if [ `command -v wget` ]; then + wget $mysqlurl -O mysql.$archive_ext + elif [ `command -v curl` ]; then + curl -o mysql.$archive_ext $mysqlurl + else + echo "Failed to locate wget or curl. Install one of these programs to download MySQL." + exit 1 + fi + $decomp mysql.$archive_ext + mv $mysqlver mysql-5.0 + rm mysql.$archive_ext fi - $decomp mysql.$archive_ext - mv $mysqlver mysql-5.0 - rm mysql.$archive_ext fi checkout ()