Changeset 19909

Timestamp:

2009-06-24T19:08:52+12:00 (15 years ago)

Author:

ak19

Message:

1. Unzips iconv if not yet unzipped. 2. Calls winMake on the indexers folder with parameter gs2 only if we're dealing with GS2 (runtime-src exists). Otherwise, we're dealing with GS3 and the parameter gs2 is not passed to the indexers' winMake batfile.

File:

• gsdl/trunk/common-src/win32.mak (modified) (2 diffs)

gsdl/trunk/common-src/win32.mak

@@ -90 +90 @@
     cd packages\windows\expat
     if NOT EXIST "expat" unzip expat.zip
+    cd "$(COMMONHOME)"
+    cd indexers\packages\windows\iconv
+    if NOT EXIST "iconv" unzip iconv.zip
+    cd "$(COMMONHOME)"
+#   cd packages\sqlite
+#   if NOT EXIST "sqlite-amalgamation-3.5.9" unzip sqlite-amalgamation-3.5.zip
+#   cd "$(COMMONHOME)"
 
 clean:
@@ -162 +169 @@
     cd "$@"
     set DEBUG=$(DEBUG)
-    call winMake.bat all gs2 
-    call winMake.bat install gs2
+    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all gs2 
+    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat install gs2
+    if NOT EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all
+    if NOT EXIST "$(GSDLHOME)\runtime-src" call winMake.bat install
+
     set DEBUG=
     if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows"