Temporarily disable yaz4j for now (should be part of allj rule)
# Parameters
DEBUG=0 # 0 for release, 1 for debug
# Parameters
DEBUG=0 # 0 for release, 1 for debug
all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \
testprog iconv icu libxml2 libxslt yaz_url
all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \
testprog iconv icu libxml2 libxslt yaz_url
-NSIS="c:\program files\nsis\makensis.exe"
-HHC="c:\program files\html help workshop\hhc.exe"
+allj: all
+
+NSIS="c:\program files (x86)\nsis\makensis.exe"
+HHC="c:\program files (x86)\html help workshop\hhc.exe"
dist: yaz.win32.nsi yaz.nsi distclean
dist: yaz.win32.nsi yaz.nsi distclean
- nmake DEBUG=0 all yaz4j
$(NSIS) yaz.win32.nsi
dist64: yaz.win64.nsi yaz.nsi distclean
$(NSIS) yaz.win32.nsi
dist64: yaz.win64.nsi yaz.nsi distclean
$(NSIS) yaz.win64.nsi
make64:
$(NSIS) yaz.win64.nsi
make64:
- nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.9.2.win64 LIBXSLT_DIR=c:\libxslt-1.1.28.win64 ICU_LIB=\icu64\lib64 ICU_INCLUDE=\icu64\include ICU_BIN=\icu64\bin64 YAZ4J_DIR=..\..\..\yaz4j all yaz4j
+ nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.9.2.win64 LIBXSLT_DIR=c:\libxslt-1.1.28.win64 ICU_LIB=\icu\lib64 ICU_INCLUDE=\icu\include ICU_BIN=\icu\bin64 YAZ4J_DIR=..\..\..\yaz4j allj
!if $(USE_MANIFEST)
MT=mt.exe /nologo
!if $(USE_MANIFEST)
MT=mt.exe /nologo
!endif
LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
$(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
!endif
LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
$(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no /manifest
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no $(MTOPT)
DEBUG_LNK_OPTIONS= /debug
DEBUG_LNK_OPTIONS= /debug
-del $(BINDIR)\*.exe
-del $(BINDIR)\*.dll
-del $(BINDIR)\*.pdb
-del $(BINDIR)\*.exe
-del $(BINDIR)\*.dll
-del $(BINDIR)\*.pdb
+ -del $(BINDIR)\*.manifest
-del $(TMPDIR)\*.
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ
-del $(TMPDIR)\*.
-del $(LIBDIR)\*.LIB
-del $(OBJDIR)\*.OBJ
;!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
;!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+; 5: VS 2013
+;!define VS_RUNTIME_DLL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvc*.dll"
+;!define VS_RUNTIME_MANIFEST ""
+
Noservice:
SetOutPath $INSTDIR\bin
File "${VS_RUNTIME_DLL}"
Noservice:
SetOutPath $INSTDIR\bin
File "${VS_RUNTIME_DLL}"
+!if "${VS_RUNTIME_MANIFEST}" != ""
File "${VS_RUNTIME_MANIFEST}"
File "${VS_RUNTIME_MANIFEST}"
File ..\bin\*.dll
File ..\bin\*.exe
SetOutPath $SMPROGRAMS\YAZ
File ..\bin\*.dll
File ..\bin\*.exe
SetOutPath $SMPROGRAMS\YAZ
Section "YAZ4J" YAZ4J
SectionIn 1 2
SetOutPath $INSTDIR\bin
Section "YAZ4J" YAZ4J
SectionIn 1 2
SetOutPath $INSTDIR\bin
+ File /nonfatal ..\bin\yaz4j.dll
+ File /nonfatal ..\java\yaz4j.jar
SectionEnd
; begin uninstall settings/section
SectionEnd
; begin uninstall settings/section
-; YAZ for Windows 32 bit, VS 2008
-!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
-!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+; YAZ for Windows 32 bit, VS 2013
+!define VS_RUNTIME_DLL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvc*.dll"
+!define VS_RUNTIME_MANIFEST ""
InstallDir "$PROGRAMFILES\YAZ"
InstallDir "$PROGRAMFILES\YAZ"
-; YAZ for Windows 64 bit, VS 2008
-!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\amd64\Microsoft.VC90.CRT\msvc*90.dll"
-!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+; YAZ for Windows 64 bit, VS 2013
+!define VS_RUNTIME_DLL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvc*.dll"
+!define VS_RUNTIME_MANIFEST ""
InstallDir "$PROGRAMFILES64\YAZ"
InstallDir "$PROGRAMFILES64\YAZ"