[[ TimeZoneLibrary ]] Use gawk on linux

livecodeali · livecodeali · commit 6bb3593d4391 · 2018-02-20T16:46:24.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -113,6 +113,7 @@ addons:
   # Packages needed for building LiveCode
   apt:
     packages:
+      - gawk
       - libx11-dev
       - libxext-dev
       - libxrender-dev
diff --git a/docs/development/build-linux.md b/docs/development/build-linux.md
@@ -55,6 +55,7 @@ The following additional packages should be installed before building:
 * build-essential
 * automake
 * libtool
+* gawk
 * git
 * curl
 * flex
@@ -77,7 +78,7 @@ The following additional packages should be installed before building:
 
 Use 
 
-    sudo apt-get install build-essential automake libtool git curl flex &&
+    sudo apt-get install build-essential automake libtool gawk git curl flex &&
     sudo apt-get install bison libx11-dev libxext-dev libxrender-dev libxft-dev &&
     sudo apt-get install libxinerama-dev libxv-dev libxcursor-dev libfreetype6-dev && 
     sudo apt-get install libpopt-dev libesd0-dev liblcms2-dev pkg-config libgtk2.0-dev zip
diff --git a/extensions/libraries/timezone/tz/tz.gyp b/extensions/libraries/timezone/tz/tz.gyp
@@ -150,12 +150,28 @@
 								},
 							},
 						],
+						[
+						    'OS == "linux"',
+						    {
+						        'variables':
+						        {
+						            'awk': 'gawk',
+						        },
+						    },
+						    {
+						        'variables':
+						        {
+						            'awk': 'awk',
+						        },						    
+						    },
+						]
 					],
 					
 					'action':
 					[
 						'<@(build_command)',
 						'<(INTERMEDIATE_DIR)',
+						'<(awk)',
 						'ziguard.awk',
 						'zishrink.awk',
 						'version',
diff --git a/extensions/libraries/timezone/tz/tzdata.sh b/extensions/libraries/timezone/tz/tzdata.sh
@@ -2,17 +2,16 @@
 
 # Utility script called by the build system to build tzdata.zi
 
-set -x
-
-# Arguments 4 and above are the list of zone data files
+# Arguments 5 and above are the list of zone data files
 readonly output_dir=$1
-readonly ziguard=$2
-readonly zishrink=$3
-readonly version_file=$4
-shift 4
+readonly awk_bin=$2
+readonly ziguard=$3
+readonly zishrink=$4
+readonly version_file=$5
+shift 5
 
-awk -v outfile='main.zi' -f "${ziguard}" $@ > "${output_dir}/main.zi"
+${awk_bin} -v outfile='main.zi' -f "${ziguard}" $@ > "${output_dir}/main.zi"
 
 version=`sed 1q ${version_file}` && \
-	LC_ALL=C awk -v version="$$version" -f "${zishrink}" \
+	LC_ALL=C ${awk_bin} -v version="$$version" -f "${zishrink}" \
 	${output_dir}/main.zi > ${output_dir}/tzdata.zi
