Merge pull request #80 from xPaw/package-script

Package script fixes
2014-07-27 11:44:56 +02:00 · 2014-07-27 11:44:56 +02:00 · 87c0be470b
commit 87c0be470b
parent 3241e91e84 f2b1d26da3
10 changed files with 69 additions and 67 deletions
--- a/.gitignore
+++ b/.gitignore
@ -27,3 +27,7 @@ Thumbs.db
 # Build directories
 build/
 obj-*/
+
+# AMXX plugin build related files
+plugins/compile.dat
+plugins/compiled/
--- a/.travis.yml
+++ b/.travis.yml
@ -4,8 +4,8 @@ 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
+  - python ../configure.py --enable-optimize --no-mysql
  - ambuild
--- a/amxmodx/msvc10/amxmodx_mm.vcxproj
+++ b/amxmodx/msvc10/amxmodx_mm.vcxproj
@ -412,6 +412,7 @@
    <None Include="..\..\plugins\include\amxconst.inc" />
    <None Include="..\..\plugins\include\amxmisc.inc" />
    <None Include="..\..\plugins\include\amxmodx.inc" />
+    <None Include="..\..\plugins\include\amxmodx_version.inc" />
    <None Include="..\..\plugins\include\cellarray.inc" />
    <None Include="..\..\plugins\include\celltrie.inc" />
    <None Include="..\..\plugins\include\core.inc" />
@ -423,7 +424,6 @@
    <None Include="..\..\plugins\include\messages.inc" />
    <None Include="..\..\plugins\include\sorting.inc" />
    <None Include="..\..\plugins\include\string.inc" />
-    <None Include="..\..\plugins\include\svn_version.inc" />
    <None Include="..\..\plugins\include\time.inc" />
    <None Include="..\..\plugins\include\vault.inc" />
    <None Include="..\..\plugins\include\vector.inc" />
--- a/amxmodx/msvc10/amxmodx_mm.vcxproj.filters
+++ b/amxmodx/msvc10/amxmodx_mm.vcxproj.filters
@ -360,6 +360,9 @@
    <None Include="..\..\plugins\include\amxmodx.inc">
      <Filter>Pawn Includes</Filter>
    </None>
+    <None Include="..\..\plugins\include\amxmodx_version.inc">
+      <Filter>Pawn Includes</Filter>
+    </None>
    <None Include="..\..\plugins\include\core.inc">
      <Filter>Pawn Includes</Filter>
    </None>
@ -387,9 +390,6 @@
    <None Include="..\..\plugins\include\string.inc">
      <Filter>Pawn Includes</Filter>
    </None>
-    <None Include="..\..\plugins\include\svn_version.inc">
-      <Filter>Pawn Includes</Filter>
-    </None>
    <None Include="..\..\plugins\include\time.inc">
      <Filter>Pawn Includes</Filter>
    </None>
--- 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"
--- a/plugins/include/amxconst.inc
+++ b/plugins/include/amxconst.inc
@ -11,7 +11,7 @@
 #endif
 #define _amxconst_included

-#include <svn_version>
+#include <amxmodx_version>

 /**
 * This is the buffer size AMX Mod X uses internally to retrieve strings from plugins.
--- a/plugins/include/amxmodx_version.inc
+++ 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		1.83
+#define AMXX_VERSION_NUM	183
+stock const AMXX_VERSION_STR[] = "1.8.3-manual";
--- a/plugins/include/svn_version.inc
+++ b/plugins/include/svn_version.inc
@ -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 <amxmodx_version>
-#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
--- 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 'amxmodx_version.inc' in generated_header.path:
    builder.AddCopy(generated_header, folder_map['base/addons/amxmodx/scripting/include'])
    break

@ -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',
 ]
--- 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 ()