Download as
Browse Code »

Commit de621e88e70050947a8a87ef9943953b60fa8785

Authored by Perry Werneck
1 parent 3f546393
Exists in master and in 3 other branches develop, edit-header-bar, script-support

Fixing windows build.

Showing 2 changed files with 38 additions and 3 deletions   Show diff stats
win/pack.sh
  Diff comments   View file @de621e8
... ... @@ -87,16 +87,16 @@ clone()
87 87 BRANCH=${!TEMPVAR}
88 88 fi
89 89  
  90 + echo "Cloning ${1} ${BRANCH}"
90 91 if [ -z ${BRANCH} ]; then
91 92 git clone --quiet ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
92 93 else
93 94 echo -e "\e]2;Cloning ${1} ${BRANCH}\a"
94   - echo "Cloning ${1} ${BRANCH}"
95 95 git clone --quiet --branch "${BRANCH}" ${GIT_URL}/${1}.git ${WORKDIR}/sources/${1}
96 96 fi
97 97  
98 98 if [ "$?" != "0" ]; then
99   - failed "Can't get sources for ${1}"
  99 + failed "Can't get ${BRANCH} sources for ${1}"
100 100 fi
101 101  
102 102 }
... ...
win/pw3270.nsi.in
  Diff comments   View file @de621e8
... ... @@ -118,6 +118,7 @@ SubSection "@PRODUCT_NAME@" SecMain
118 118 # Misc folders
119 119 CreateDirectory "$INSTDIR\certs"
120 120 CreateDirectory "$INSTDIR\plugins"
  121 + CreateDirectory "$INSTDIR\keypad"
121 122  
122 123 # UI definition files
123 124 CreateDirectory "$INSTDIR\ui"
... ... @@ -211,6 +212,13 @@ SubSection "@PRODUCT_NAME@" SecMain
211 212 SectionEnd
212 213 !endif
213 214  
  215 + Section "KEYPADS" Keypads
  216 +
  217 + file "/oname=$INSTDIR\keypad\00-right.xml" "@PRODUCT_NAME@\keypad\00-right.xml"
  218 + file "/oname=$INSTDIR\keypad\10-bottom.xml" "@PRODUCT_NAME@\keypad\10-bottom.xml"
  219 +
  220 + SectionEnd
  221 +
214 222 !ifdef WITHMONO-TN3270
215 223 Section /o ".NET" DOTNET
216 224  
... ... @@ -331,7 +339,34 @@ SectionEnd
331 339  
332 340 Function .onInit
333 341  
334   - #---[ Check DOTNET Command line option ]0-------------------------------------------------------------
  342 + #---[ Check SDK Command line option ]-----------------------------------------------------------------
  343 +
  344 +!ifdef WITHSDK
  345 +
  346 + Push $0
  347 +
  348 + ${GetParameters} $R0
  349 + ClearErrors
  350 + ${GetOptions} $R0 /SDK= $0
  351 +
  352 + ${if} $0 == "NO"
  353 +
  354 + SectionGetFlags ${SDK} $0
  355 + IntOp $0 $0 & ${SECTION_OFF}
  356 + SectionSetFlags ${SDK} $0
  357 +
  358 + ${else}
  359 +
  360 + SectionGetFlags ${SDK} $0
  361 + IntOp $0 $0 | ${SF_SELECTED}
  362 + SectionSetFlags ${SDK} $0
  363 +
  364 + ${EndIf}
  365 +
  366 + Pop $0
  367 +!endif
  368 +
  369 + #---[ Check DOTNET Command line option ]--------------------------------------------------------------
335 370  
336 371 !ifdef WITHMONO-TN3270
337 372 Push $0
... ...