diff --git a/win/pack.sh b/win/pack.sh index e56222a..30d303c 100755 --- a/win/pack.sh +++ b/win/pack.sh @@ -28,8 +28,8 @@ PRODUCT_NAME="pw3270" LIBRARY_NAME="lib3270" -CORE_LIBRARIES="lib3270 libv3270" -PACKAGE_PLUGINS="ipc" +CORE_LIBRARIES="lib3270 libv3270 libipc3270" +PACKAGE_PLUGINS="" PACKAGE_LANGUAGE_BINDINGS="hllapi mono" TARGET_ARCHS="x86_64 x86_32" GIT_URL="https://github.com/PerryWerneck" @@ -503,16 +503,10 @@ makeRuntime() # makeInstaller() { - NSIS_ARGS="-DWITHGTK" + NSIS_ARGS="-DWITHGTK -DWITHIPC -DWITHPLUGINS" if [ -d ${CERTS_DIR} ]; then - NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS" - - fi - - if [ ! -z "${PACKAGE_PLUGINS}" ]; then - NSIS_ARGS="${NSIS_ARGS} -DWITHPLUGINS" fi if [ ! -z "${PACKAGE_LANGUAGE_BINDINGS}" ]; then diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in index bd89049..84b9c27 100644 --- a/win/pw3270.nsi.in +++ b/win/pw3270.nsi.in @@ -81,7 +81,6 @@ SubSection "@PRODUCT_NAME@" SecMain file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll" file "/oname=$SYSDIR\libipc3270.dll" "libipc3270.dll" - # Configuration files file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png" "@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png" file "/oname=$INSTDIR\@PRODUCT_NAME@.png" "@PRODUCT_NAME@\@PRODUCT_NAME@.png" @@ -143,10 +142,8 @@ SubSection "@PRODUCT_NAME@" SecMain sectionEnd !endif -!ifdef WITHPLUGINS SubSection "Plugins" SecPLugin -!ifdef WITHIPC Section /o "Remote control" IPCPlugin setOutPath $INSTDIR @@ -157,10 +154,8 @@ SubSection "@PRODUCT_NAME@" SecMain file "/oname=$INSTDIR\plugins\ipcserver.dll" "@PRODUCT_NAME@-plugins\ipcserver.dll" sectionEnd -!endif SubSectionEnd -!endif !ifdef WITHLANGUAGE SubSection "Language bindins" Languages @@ -296,11 +291,9 @@ Function .onInit IntOp $0 $0 | ${SF_SELECTED} SectionSetFlags ${DOTNET} $0 -!ifdef WITHIPC SectionGetFlags ${IPCPlugin} $0 IntOp $0 $0 | ${SF_SELECTED} SectionSetFlags ${IPCPlugin} $0 -!endif ${EndIf} @@ -329,11 +322,9 @@ Function .onInit IntOp $0 $0 | ${SF_SELECTED} SectionSetFlags ${HLLAPIBinding} $0 -!ifdef WITHIPC SectionGetFlags ${IPCPlugin} $0 IntOp $0 $0 | ${SF_SELECTED} SectionSetFlags ${IPCPlugin} $0 -!endif ${EndIf} -- libgit2 0.21.2