Changeset 35703
- Timestamp:
- 2021-10-25T15:04:25+13:00 (2 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/makegs2.bat
r35535 r35703 75 75 IF NOT EXIST .\common-src\packages\windows\stlport\stlport\nul IF NOT EXIST .\common-src\packages\windows\stlport\stlport.zip GOTO ENDNOWINPACK 76 76 77 IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv\nul IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv.zip GOTO ENDNOICONV 77 78 set ICONVZIP=iconv-VS14-PLUS.zip 79 :: Following line loosely based on 80 :: https://stackoverflow.com/questions/32578014/how-to-extract-version-number-in-a-windows-batch-file/32578368 81 set VISUAL_STUDIO_MAJORVERSION=%VisualStudioVersion:.=& set VSMinor=% 82 echo VISUAL_STUDIO_MAJORVERSION = "%VISUAL_STUDIO_MAJORVERSION%" 83 if %VISUAL_STUDIO_MAJORVERSION% LSS 14 set ICONVZIP=iconv-PRE-VS14.zip 84 echo Selected iconv to unzip: %ICONVZIP% 85 86 IF NOT EXIST .\common-src\indexers\packages\windows\iconv\iconv\nul IF NOT EXIST .\common-src\indexers\packages\windows\iconv\%ICONVZIP% GOTO ENDNOICONV 78 87 79 88 IF NOT EXIST .\common-src\packages\sqlite\sqlite* IF NOT EXIST .\common-src\packages\sqlite\sqlite*.tar.gz GOTO ENDNOSQLITE … … 108 117 IF EXIST .\common-src\packages\windows\stlport\stlport.zip .\bin\windows\unzip.exe -o .\common-src\packages\windows\stlport\stlport.zip -d .\common-src\packages\windows\stlport\ 109 118 110 IF EXIST .\common-src\indexers\packages\windows\iconv\ iconv.zip .\bin\windows\unzip.exe -o .\common-src\indexers\packages\windows\iconv\iconv.zip-d .\common-src\indexers\packages\windows\iconv\119 IF EXIST .\common-src\indexers\packages\windows\iconv\%ICONVZIP% .\bin\windows\unzip.exe -o .\common-src\indexers\packages\windows\iconv\%ICONVZIP% -d .\common-src\indexers\packages\windows\iconv\ 111 120 112 121 IF EXIST .\common-src\packages\sqlite\sqlite*.tar.gz .\bin\windows\gunzip.exe -cd .\common-src\packages\sqlite\sqlite*.tar.gz | .\bin\windows\tar.exe xv --directory=./common-src/packages/sqlite -
main/trunk/greenstone2/win32.mak
r24958 r35703 26 26 27 27 GSDLHOME = $(MAKEDIR) 28 29 !IF "$(VISUAL_STUDIO_MAJORVERSION)"=="" 30 # IF not specified, default to older version to trigger older iconv.zip source code compilation 31 VISUAL_STUDIO_MAJORVERSION = 13 32 !ELSE 33 VISUAL_STUDIO_MAJORVERSION = $(VISUAL_STUDIO_MAJORVERSION) 34 !ENDIF 35 28 36 GSDL_VC4 = 0 29 37 # It only ever makes sense for GS2 to turn on LOCAL_LIBRARY and APACHE_HTTPD if needed … … 59 67 60 68 61 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" 69 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" VISUAL_STUDIO_MAJORVERSION="$(VISUAL_STUDIO_MAJORVERSION)" 62 70 63 71 !IF $(GSDL_VC4)
Note:
See TracChangeset
for help on using the changeset viewer.