Download as
Browse Code »

Commit 9de0cbfbb1c48fbc4ecea3b1d9e0388367199de4

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

Fixing windows build.

Showing 3 changed files with 8 additions and 6 deletions   Show diff stats
@@ -254,8 +254,8 @@ locale: \ @@ -254,8 +254,8 @@ locale: \
254 254
255 locale/$(PACKAGE_TARNAME).pot: \ 255 locale/$(PACKAGE_TARNAME).pot: \
256 $(POTDIR)/pw3270.pot \ 256 $(POTDIR)/pw3270.pot \
257 - /usr/share/@PRODUCT_NAME@/pot/lib3270.pot \  
258 - /usr/share/@PRODUCT_NAME@/pot/libv3270.pot \ 257 + $(datarootdir)/$(PRODUCT_NAME)/pot/lib3270.pot \
  258 + $(datarootdir)/$(PRODUCT_NAME)/pot/libv3270.pot \
259 $(POTDIR)/ui.pot 259 $(POTDIR)/ui.pot
260 260
261 @rm -f $@ 261 @rm -f $@
@@ -30,7 +30,7 @@ PRODUCT_NAME="pw3270" @@ -30,7 +30,7 @@ PRODUCT_NAME="pw3270"
30 LIBRARY_NAME="lib3270" 30 LIBRARY_NAME="lib3270"
31 CORE_LIBRARIES="lib3270 libv3270 libipc3270" 31 CORE_LIBRARIES="lib3270 libv3270 libipc3270"
32 PACKAGE_PLUGINS="" 32 PACKAGE_PLUGINS=""
33 -PACKAGE_EXTRAS="libhllapi" 33 +PACKAGE_EXTRAS="libhllapi tn3270-mono"
34 TARGET_ARCHS="x86_64 x86_32" 34 TARGET_ARCHS="x86_64 x86_32"
35 GIT_URL="https://github.com/PerryWerneck" 35 GIT_URL="https://github.com/PerryWerneck"
36 36
@@ -78,11 +78,13 @@ prepare() @@ -78,11 +78,13 @@ prepare()
78 mkdir -p ${WORKDIR}/sources 78 mkdir -p ${WORKDIR}/sources
79 79
80 TEMPVAR=${1}_branch 80 TEMPVAR=${1}_branch
81 - BRANCH=${!TEMPVAR} 81 + BRANCH=${!TEMPVAR} 2> /dev/null
82 82
83 if [ -z ${BRANCH} ]; then 83 if [ -z ${BRANCH} ]; then
84 git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} 84 git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
85 else 85 else
  86 + echo "Preparing ${1} ${BRANCH}"
  87 + echo -e "\e]2;Preparing ${1} ${BRANCH}\a"
86 git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1} 88 git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
87 fi 89 fi
88 90
win/pw3270.nsi.in
  Diff comments   View file @9de0cbf
@@ -287,7 +287,7 @@ Section "Uninstall" @@ -287,7 +287,7 @@ Section "Uninstall"
287 delete $SYSDIR\hllapi.dll 287 delete $SYSDIR\hllapi.dll
288 !endif 288 !endif
289 289
290 -!ifdef WITHMONO 290 +!ifdef WITHMONO-TN3270
291 delete $SYSDIR\mono-tn3270.dll 291 delete $SYSDIR\mono-tn3270.dll
292 !endif 292 !endif
293 293
@@ -299,7 +299,7 @@ Function .onInit @@ -299,7 +299,7 @@ Function .onInit
299 299
300 #---[ Check DOTNET Command line option ]0------------------------------------------------------------- 300 #---[ Check DOTNET Command line option ]0-------------------------------------------------------------
301 301
302 -!ifdef WITHMONO 302 +!ifdef WITHMONO-TN3270
303 Push $0 303 Push $0
304 304
305 ${GetParameters} $R0 305 ${GetParameters} $R0