diff --git a/win32/nsis/jlasso-lite.nsi b/win32/nsis/jlasso-lite.nsi index f928b255..8df2b471 100755 --- a/win32/nsis/jlasso-lite.nsi +++ b/win32/nsis/jlasso-lite.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "Liberty Alliance Single Sign On Java" -!define PRODUCT_VERSION "0.4.1" +!define PRODUCT_VERSION "0.5.0a" !define PRODUCT_PUBLISHER "Entr'ouvert" !define PRODUCT_WEB_SITE "http://lasso.entrouvert.org" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" @@ -48,7 +48,7 @@ SetCompressor bzip2 ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "Install-java-lite-0_4_1.exe" +OutFile "Install-java-lite-0_5a.exe" InstallDir "$PROGRAMFILES\Liberty Alliance Single Sign On Java" ShowInstDetails show ShowUnInstDetails show @@ -60,7 +60,7 @@ FunctionEnd Section "Java Lasso binding" SEC01 SetOutPath "$INSTDIR" SetOverwrite ifnewer - File "..\..\java\.libs\jlasso.dll" + File "..\..\java\.libs\jlasso.dll" File "..\..\java\lasso.jar" SectionEnd diff --git a/win32/nsis/lasso-deps.nsi b/win32/nsis/lasso-deps.nsi index 73161878..2dc8f9ba 100644 --- a/win32/nsis/lasso-deps.nsi +++ b/win32/nsis/lasso-deps.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "LASSO dependencies" -!define PRODUCT_VERSION "0.4.1-2" +!define PRODUCT_VERSION "0.5.0a" !define PRODUCT_PUBLISHER "Entr'ouvert" !define PRODUCT_WEB_SITE "http://lasso.entrouvert.org" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" @@ -48,7 +48,7 @@ SetCompressor bzip2 ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "Install-deps-0_4_1-2.exe" +OutFile "Install-deps-0_5a.exe" InstallDir "$SYSDIR" ShowInstDetails show ShowUnInstDetails show @@ -60,42 +60,43 @@ FunctionEnd Section "GLIB: Low-level core library that forms the basis for projects such as GTK+ and GNOME." SEC01 SetOutPath "$INSTDIR" SetOverwrite ifnewer - File "..\..\..\..\..\usr\local\lib\libglib-2.0-0.dll" - File "..\..\..\..\..\usr\local\lib\libgobject-2.0-0.dll" - File "..\..\..\..\..\usr\local\lib\libgmodule-2.0-0.dll" - File "..\..\..\..\..\usr\local\lib\libgthread-2.0-0.dll" + File "c:\cygwin\usr\local\lib\libglib-2.0-0.dll" + File "c:\cygwin\usr\local\lib\libgobject-2.0-0.dll" + File "c:\cygwin\usr\local\lib\libgmodule-2.0-0.dll" + File "c:\cygwin\usr\local\lib\libgthread-2.0-0.dll" SectionEnd -Section "LIBXML2: XML C parser and toolkit." SEC02 - File "..\..\..\..\..\usr\local\lib\libxml2.dll" +Section "LIBXML2: XML C parser and toolkit version 2.6.15." SEC02 + File "c:\cygwin\usr\local\lib\libxml2.dll" SectionEnd -Section "LIBXSLT: The XSLT C library." SEC03 - File "..\..\..\..\..\usr\local\lib\libxslt.dll" - File "..\..\..\..\..\usr\local\lib\libexslt.dll" +Section "LIBXSLT: The XSLT C library version 1.2.6." SEC03 + File "c:\cygwin\usr\local\lib\libxslt.dll" + File "c:\cygwin\usr\local\lib\libexslt.dll" SectionEnd -Section "LIBXMLSEC: XML Security Library C library based on LibXML2." SEC04 - File "..\..\..\..\..\usr\local\lib\libxmlsec.dll" - File "..\..\..\..\..\usr\local\lib\libxmlsec-mscrypto.dll" - File "..\..\..\..\..\usr\local\lib\libxmlsec-openssl.dll" +Section "LIBXMLSEC: XML Security Library C library (based on LibXML2) version 1.2.6." SEC04 + File "c:\cygwin\usr\local\lib\libxmlsec.dll" + File "c:\cygwin\usr\local\lib\libxmlsec-mscrypto.dll" + File "c:\cygwin\usr\local\lib\libxmlsec-openssl.dll" SectionEnd -Section "LIBOPENSSL: A full-strength general purpose cryptography library." SEC05 - File "..\..\..\..\..\usr\local\lib\libeay32.dll" - File "..\..\..\..\..\usr\local\lib\libssleay32.dll" +Section "LIBOPENSSL: A full-strength general purpose cryptography library version 0.9.7e." SEC05 + File "c:\cygwin\usr\local\lib\libeay32.dll" + File "c:\cygwin\usr\local\lib\libssl32.dll" SectionEnd -Section "ZLIB: A free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library." SEC06 - File "..\..\..\..\..\usr\local\lib\libz.dll" +Section "ZLIB: A free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library version 1.2.1." SEC06 + File "c:\cygwin\usr\local\lib\zlib.dll" + File "c:\cygwin\usr\local\lib\zlib1.dll" SectionEnd Section "LIBICONV: Free iconv() implementation." SEC07 - File "..\..\..\..\..\usr\local\lib\libiconv.dll" + File "c:\cygwin\usr\local\lib\iconv.dll" SectionEnd Section "LIBINTL: Library for native language support." SEC08 - File "..\..\..\..\..\usr\local\lib\intl.dll" + File "c:\cygwin\usr\local\lib\intl.dll" SectionEnd Section -AdditionalIcons @@ -117,11 +118,11 @@ SectionEnd ; Section descriptions !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "GLIB: Low-level core library that forms the basis for projects such as GTK+ and GNOME." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "LIBXML2: XML C parser and toolkit." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "LIBXSLT: The XSLT C library." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "LIBXMLSEC: XML Security Library C library based on LibXML2 with openssl and mscrypto modules." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "LIBOPENSSL: A full-strength general purpose cryptography library." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "ZLIB: A free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "LIBXML2: XML C parser and toolkit version 2.5.15." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "LIBXSLT: The XSLT C library version 1.2.12." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "LIBXMLSEC: XML Security Library C library version 1.2.6 (based on LibXML2) with openssl and mscrypto modules." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "LIBOPENSSL: A full-strength general purpose cryptography library version 0.9.7e." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "ZLIB: A free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library version 1.2.1." !insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "LIBICONV: Free iconv() implementation." !insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "LIBINTL: Library for native language support." !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -141,9 +142,10 @@ FunctionEnd Section Uninstall Delete "$INSTDIR\${PRODUCT_NAME}.url" Delete "$INSTDIR\uninst.exe" - Delete "$INSTDIR\libiconv.dll" - Delete "$INSTDIR\libz.dll" - Delete "$INSTDIR\libssleay32.dll" + Delete "$INSTDIR\iconv.dll" + Delete "$INSTDIR\zlib.dll" + Delete "$INSTDIR\zlib1.dll" + Delete "$INSTDIR\libssl32.dll" Delete "$INSTDIR\libeay32.dll" Delete "$INSTDIR\libxmlsec-openssl.dll" Delete "$INSTDIR\libxmlsec-mscrypto.dll" diff --git a/win32/nsis/lasso-full.nsi b/win32/nsis/lasso-full.nsi index b283a795..7882fb57 100644 --- a/win32/nsis/lasso-full.nsi +++ b/win32/nsis/lasso-full.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "Liberty Alliance Single Sign On and all dependencies" -!define PRODUCT_VERSION "0.4.1-2" +!define PRODUCT_VERSION "0.5.0a" !define PRODUCT_PUBLISHER "Entr'ouvert" !define PRODUCT_WEB_SITE "http://www.entrouvert.org" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" @@ -48,11 +48,11 @@ SetCompressor bzip2 ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "Install-full-0_4_1-2.exe" +OutFile "Install-full-0_5a.exe" InstallDir "$SYSDIR" ShowInstDetails show ShowUnInstDetails show - +AutoCloseWindow false Function .onInit !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd @@ -60,46 +60,47 @@ FunctionEnd Section "GLIB: Low-level core library that forms the basis for projects such as GTK+ and GNOME." SEC01 SetOutPath "$INSTDIR" SetOverwrite ifnewer - File "..\..\..\..\..\usr\local\lib\libglib-2.0-0.dll" - File "..\..\..\..\..\usr\local\lib\libgobject-2.0-0.dll" - File "..\..\..\..\..\usr\local\lib\libgmodule-2.0-0.dll" - File "..\..\..\..\..\usr\local\lib\libgthread-2.0-0.dll" + File "c:\cygwin\usr\local\lib\libglib-2.0-0.dll" + File "c:\cygwin\usr\local\lib\libgobject-2.0-0.dll" + File "c:\cygwin\usr\local\lib\libgmodule-2.0-0.dll" + File "c:\cygwin\usr\local\lib\libgthread-2.0-0.dll" SectionEnd -Section "LIBXML2: XML C parser and toolkit." SEC02 - File "..\..\..\..\..\usr\local\lib\libxml2.dll" +Section "LIBXML2: XML C parser and toolkit version 2.6.15." SEC02 + File "c:\cygwin\usr\local\lib\libxml2.dll" SectionEnd -Section "LIBXSLT: The XSLT C library." SEC03 - File "..\..\..\..\..\usr\local\lib\libxslt.dll" - File "..\..\..\..\..\usr\local\lib\libexslt.dll" +Section "LIBXSLT: The XSLT C library version 1.2.6." SEC03 + File "c:\cygwin\usr\local\lib\libxslt.dll" + File "c:\cygwin\usr\local\lib\libexslt.dll" SectionEnd -Section "LIBXMLSEC: XML Security Library C library based on LibXML2." SEC04 - File "..\..\..\..\..\usr\local\lib\libxmlsec.dll" - File "..\..\..\..\..\usr\local\lib\libxmlsec-mscrypto.dll" - File "..\..\..\..\..\usr\local\lib\libxmlsec-openssl.dll" +Section "LIBXMLSEC: XML Security Library C library (based on LibXML2) version 1.2.6." SEC04 + File "c:\cygwin\usr\local\lib\libxmlsec.dll" + File "c:\cygwin\usr\local\lib\libxmlsec-mscrypto.dll" + File "c:\cygwin\usr\local\lib\libxmlsec-openssl.dll" SectionEnd -Section "LIBOPENSSL: A full-strength general purpose cryptography library." SEC05 - File "..\..\..\..\..\usr\local\lib\libeay32.dll" - File "..\..\..\..\..\usr\local\lib\libssleay32.dll" +Section "LIBOPENSSL: A full-strength general purpose cryptography library version 0.9.7e." SEC05 + File "c:\cygwin\usr\local\lib\libeay32.dll" + File "c:\cygwin\usr\local\lib\libssl32.dll" SectionEnd -Section "ZLIB: A free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library." SEC06 - File "..\..\..\..\..\usr\local\lib\libz.dll" +Section "ZLIB: A free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library version 1.2.1." SEC06 + File "c:\cygwin\usr\local\lib\zlib.dll" + File "c:\cygwin\usr\local\lib\zlib1.dll" SectionEnd Section "LIBICONV: Free iconv() implementation." SEC07 - File "..\..\..\..\..\usr\local\lib\libiconv.dll" + File "c:\cygwin\usr\local\lib\iconv.dll" SectionEnd Section "LIBINTL: Library for native language support." SEC08 - File "..\..\..\..\..\usr\local\lib\intl.dll" + File "c:\cygwin\usr\local\lib\intl.dll" SectionEnd Section "L.A.S.S.O." SEC09 - File "..\..\lasso\.libs\liblasso-1.dll" + File "..\..\lasso\.libs\liblasso-2.dll" SectionEnd Section -AdditionalIcons @@ -121,11 +122,11 @@ SectionEnd ; Section descriptions !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "GLIB: Low-level core library that forms the basis for projects such as GTK+ and GNOME." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "LIBXML2: XML C parser and toolkit." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "LIBXSLT: The XSLT C library." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "LIBXMLSEC: XML Security Library C library based on LibXML2 with openssl and mscrypto modules." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "LIBOPENSSL: A full-strength general purpose cryptography library." - !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "ZLIB: A free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "LIBXML2: XML C parser and toolkit version 2.5.15." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "LIBXSLT: The XSLT C library version 1.2.12." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "LIBXMLSEC: XML Security Library C library version 1.2.6 (based on LibXML2) with openssl and mscrypto modules." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "LIBOPENSSL: A full-strength general purpose cryptography library version 0.9.7e." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "ZLIB: A free, general-purpose, legally unencumbered -- that is, not covered by any patents -- lossless data-compression library version 1.2.1." !insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "LIBICONV: Free iconv() implementation." !insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "LIBINTL: Library for native language support." !insertmacro MUI_DESCRIPTION_TEXT ${SEC09} "LIBLASSO: Free implementation of the Liberty Alliance specifications." @@ -146,9 +147,10 @@ FunctionEnd Section Uninstall Delete "$INSTDIR\${PRODUCT_NAME}.url" Delete "$INSTDIR\uninst.exe" - Delete "$INSTDIR\liblasso-1.dll" - Delete "$INSTDIR\libiconv.dll" - Delete "$INSTDIR\libz.dll" + Delete "$INSTDIR\liblasso-2.dll" + Delete "$INSTDIR\iconv.dll" + Delete "$INSTDIR\zlib.dll" + Delete "$INSTDIR\zlib1.dll" Delete "$INSTDIR\libssleay32.dll" Delete "$INSTDIR\libeay32.dll" Delete "$INSTDIR\libxmlsec-openssl.dll" diff --git a/win32/nsis/lasso-lite.nsi b/win32/nsis/lasso-lite.nsi index 82bcacec..fc8beeed 100644 --- a/win32/nsis/lasso-lite.nsi +++ b/win32/nsis/lasso-lite.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "Liberty Alliance Single Sign On" -!define PRODUCT_VERSION "0.4.1" +!define PRODUCT_VERSION "0.5.0a" !define PRODUCT_PUBLISHER "Entr'ouvert" !define PRODUCT_WEB_SITE "http://www.entrouvert.org" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" @@ -48,17 +48,20 @@ SetCompressor bzip2 ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "Install-lite-0_4_1.exe" +OutFile "Install-lite-0_5a.exe" InstallDir "$SYSDIR" ShowInstDetails show ShowUnInstDetails show + Function .onInit !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd -Section "L.A.S.S.O." SEC08 - File "..\..\lasso\.libs\liblasso-1.dll" +Section "L.A.S.S.O." SEC01 + SetOutPath "$INSTDIR" + SetOverwrite ifnewer + File "..\..\lasso\.libs\liblasso-2.dll" SectionEnd Section -AdditionalIcons @@ -79,7 +82,7 @@ SectionEnd ; Section descriptions !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "Free implementation of the Liberty Alliance specifications." + !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Free implementation of the Liberty Alliance specifications." !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -97,7 +100,7 @@ FunctionEnd Section Uninstall Delete "$INSTDIR\${PRODUCT_NAME}.url" Delete "$INSTDIR\uninst.exe" - Delete "$INSTDIR\liblasso-1.dll" + Delete "$INSTDIR\liblasso-2.dll" Delete "$SMPROGRAMS\Liberty Alliance Single Sign On\Uninstall.lnk" Delete "$SMPROGRAMS\Liberty Alliance Single Sign On\Website.lnk" @@ -106,5 +109,5 @@ Section Uninstall RMDir "$INSTDIR" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - SetAutoClose true + SetAutoClose false SectionEnd