From 0df08d220426c79fade672e3c154ba007d40ecd7 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 22 Feb 2014 08:02:23 +0000
Subject: [PATCH] Synthesis: Merge "sdk" package back into the game.

git-svn-id: https://svn.eduke32.com/eduke32@4342 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/synthesis.sh | 48 ++++++++++----------------------------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/polymer/synthesis.sh b/polymer/synthesis.sh
index 68b72e250..9b0d9fbe2 100755
--- a/polymer/synthesis.sh
+++ b/polymer/synthesis.sh
@@ -94,6 +94,7 @@ function package_start ()
     cd $package
 
     cp -R $top/$source/package/common/* ./
+    cp -R $top/$source/package/sdk/* ./
 }
 
 function package_debug ()
@@ -110,11 +111,6 @@ function package_game_lunatic ()
     cp $top/$source/source/lunatic/test/{damagehplane,delmusicsfx,helixspawner,shadexfog}.lua ./lunatic/test/
 }
 
-function package_sdk ()
-{
-    cp -R $top/$source/package/sdk/* ./
-}
-
 function package_execute ()
 {
     echo 7zr a -mx9 -t7z $output/$date-$head/${*}_$date-$head.7z *
@@ -147,18 +143,12 @@ then
     # make sure all the targets were produced
     verifytargets
 
-    # package game
+    # package
     package_start
     package_debug win32
     mv -f $top/$source/eduke32$exe "$package/eduke32.debug$exe"
-    package_execute ${basename}_win32_debug
-
-    # package sdk
-    package_start
-    package_debug win32
-    package_sdk
     mv -f $top/$source/mapster32$exe "$package/mapster32.debug$exe"
-    package_execute ${basename}-sdk_win32_debug
+    package_execute ${basename}_win32_debug
 
 
     # 64-bit debug
@@ -170,18 +160,12 @@ then
     # make sure all the targets were produced
     verifytargets
 
-    # package game
+    # package
     package_start
     package_debug win64
     mv -f $top/$source/eduke32$exe "$package/eduke32.debug$exe"
-    package_execute ${basename}_win64_debug
-
-    # package sdk
-    package_start
-    package_debug win64
-    package_sdk
     mv -f $top/$source/mapster32$exe "$package/mapster32.debug$exe"
-    package_execute ${basename}-sdk_win64_debug
+    package_execute ${basename}_win64_debug
 
 
     # 32-bit Lunatic (pre-)release
@@ -196,7 +180,7 @@ then
         # make sure all the targets were produced
         verifytargets
 
-        # package game
+        # package
         package_start
         package_game_lunatic
         mv -f $top/$source/eduke32$exe "$package/leduke32_PREVIEW$exe"
@@ -215,7 +199,7 @@ then
         # make sure all the targets were produced
         verifytargets
 
-        # package game
+        # package
         package_start
         package_game_lunatic
         mv -f $top/$source/eduke32$exe "$package/leduke32_PREVIEW$exe"
@@ -233,16 +217,11 @@ then
     # make sure all the targets were produced
     verifytargets
 
-    # package game
+    # package
     package_start
     mv -f $top/$source/eduke32$exe "$package/eduke32$exe"
-    package_execute ${basename}_win32
-
-    # package sdk
-    package_start
-    package_sdk
     mv -f $top/$source/mapster32$exe "$package/mapster32$exe"
-    package_execute ${basename}-sdk_win32
+    package_execute ${basename}_win32
 
 
     # 64-bit release
@@ -254,16 +233,11 @@ then
     # make sure all the targets were produced
     verifytargets
 
-    # package game
+    # package
     package_start
     mv -f $top/$source/eduke32$exe "$package/eduke32$exe"
-    package_execute ${basename}_win64
-
-    # package sdk
-    package_start
-    package_sdk
     mv -f $top/$source/mapster32$exe "$package/mapster32$exe"
-    package_execute ${basename}-sdk_win64
+    package_execute ${basename}_win64
 
 
     # clean up