Download as
Browse Code »

Commit 43db7be63321ce8569410fc2e81a33e2f67fb7af

Authored by Perry Werneck
1 parent f5f4d3d3
Exists in v5.2

Fixing win32 package.

Showing 2 changed files with 15 additions and 4 deletions   Show diff stats
@@ -159,13 +159,16 @@ case "$host" in @@ -159,13 +159,16 @@ case "$host" in
159 if test "$host_cpu" = "x86_64"; then 159 if test "$host_cpu" = "x86_64"; then
160 app_cv_programfiles="PROGRAMFILES64" 160 app_cv_programfiles="PROGRAMFILES64"
161 app_cv_winarch="64" 161 app_cv_winarch="64"
  162 + app_cv_nsisredir="DisableX64FSRedirection"
162 else 163 else
163 app_cv_programfiles="PROGRAMFILES" 164 app_cv_programfiles="PROGRAMFILES"
164 app_cv_winarch="32" 165 app_cv_winarch="32"
  166 + app_cv_nsisredir="EnableX64FSRedirection"
165 fi 167 fi
166 168
167 AC_SUBST(PROGRAMFILES,$app_cv_programfiles) 169 AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
168 AC_SUBST(WINARCH,$app_cv_winarch) 170 AC_SUBST(WINARCH,$app_cv_winarch)
  171 + AC_SUBST(NSISREDIR,$app_cv_nsisredir)
169 AC_SUBST(LIBEXT,.dll) 172 AC_SUBST(LIBEXT,.dll)
170 ;; 173 ;;
171 174
win/pw3270.nsi.in
  Diff comments   View file @43db7be
@@ -80,7 +80,6 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -80,7 +80,6 @@ SubSection "@PRODUCT_NAME@" SecMain
80 file "/oname=$INSTDIR\lib@LIBRARY_NAME@.dll" "lib@LIBRARY_NAME@.dll" 80 file "/oname=$INSTDIR\lib@LIBRARY_NAME@.dll" "lib@LIBRARY_NAME@.dll"
81 file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll" 81 file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll"
82 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll" 82 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll"
83 - file "/oname=$SYSDIR\libipc3270.dll" "libipc3270.dll"  
84 83
85 # Configuration files 84 # Configuration files
86 file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png" "@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png" 85 file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png" "@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png"
@@ -150,10 +149,13 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -150,10 +149,13 @@ SubSection "@PRODUCT_NAME@" SecMain
150 setOutPath $INSTDIR 149 setOutPath $INSTDIR
151 150
152 ${DisableX64FSRedirection} 151 ${DisableX64FSRedirection}
153 - CreateDirectory "$INSTDIR\plugins"  
154 152
  153 + CreateDirectory "$INSTDIR\plugins"
155 file "/oname=$INSTDIR\plugins\ipcserver.dll" "@PRODUCT_NAME@-plugins\ipcserver.dll" 154 file "/oname=$INSTDIR\plugins\ipcserver.dll" "@PRODUCT_NAME@-plugins\ipcserver.dll"
156 155
  156 + ${@NSISREDIR@}
  157 + file "/oname=$SYSDIR\libipc3270.dll" "libipc3270.dll"
  158 +
157 sectionEnd 159 sectionEnd
158 160
159 SubSectionEnd 161 SubSectionEnd
@@ -164,7 +166,9 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -164,7 +166,9 @@ SubSection "@PRODUCT_NAME@" SecMain
164 !ifdef WITHLIBHLLAPI 166 !ifdef WITHLIBHLLAPI
165 Section /o "HLLAPI" HLLAPIBinding 167 Section /o "HLLAPI" HLLAPIBinding
166 168
167 - ${DisableX64FSRedirection} 169 + ${@NSISREDIR@}
  170 +
  171 + # Install HLLAPI connector
168 file "/oname=$SYSDIR\hllapi.dll" "libhllapi.dll" 172 file "/oname=$SYSDIR\hllapi.dll" "libhllapi.dll"
169 173
170 # Install with "lib" prefix for compatibility. 174 # Install with "lib" prefix for compatibility.
@@ -176,11 +180,13 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -176,11 +180,13 @@ SubSection "@PRODUCT_NAME@" SecMain
176 !ifdef WITHMONO-TN3270 180 !ifdef WITHMONO-TN3270
177 Section /o ".NET" DOTNET 181 Section /o ".NET" DOTNET
178 182
179 - ${DisableX64FSRedirection}  
180 CreateDirectory "$INSTDIR\dotnet" 183 CreateDirectory "$INSTDIR\dotnet"
181 184
  185 + ${DisableX64FSRedirection}
182 file "/oname=$INSTDIR\dotnet\tn3270.dll" "mono/lib/tn3270-5.2/tn3270.dll" 186 file "/oname=$INSTDIR\dotnet\tn3270.dll" "mono/lib/tn3270-5.2/tn3270.dll"
183 file "/oname=$INSTDIR\dotnet\tn3270.xml" "mono/gapi-2.0/tn3270/tn3270.xml" 187 file "/oname=$INSTDIR\dotnet\tn3270.xml" "mono/gapi-2.0/tn3270/tn3270.xml"
  188 +
  189 + ${@NSISREDIR@}
184 file "/oname=$SYSDIR\mono-tn3270.dll" "mono-tn3270.dll" 190 file "/oname=$SYSDIR\mono-tn3270.dll" "mono-tn3270.dll"
185 191
186 SectionEnd 192 SectionEnd
@@ -290,6 +296,8 @@ Section "Uninstall" @@ -290,6 +296,8 @@ Section "Uninstall"
290 SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 296 SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
291 297
292 # Delete System libraries 298 # Delete System libraries
  299 + ${@NSISREDIR@}
  300 +
293 delete $SYSDIR\libipc3270.dll 301 delete $SYSDIR\libipc3270.dll
294 302
295 !ifdef WITHHLLAPI 303 !ifdef WITHHLLAPI