Download as
Browse Code »

Commit eae848b2a20b5b6005f06f5522d0de9b99516645

Authored by Perry Werneck
1 parent 7f2b5047
Exists in develop

Working on cross bundler.

Showing 2 changed files with 95 additions and 25 deletions   Show diff stats
win/bundle.cross
  Diff comments   View file @eae848b
@@ -40,11 +40,20 @@ prepare @@ -40,11 +40,20 @@ prepare
40 40
41 # List of pre-built packages 41 # List of pre-built packages
42 packages="lib3270 libv3270 libipc3270 libhllapi pw3270-plugin-ipc" 42 packages="lib3270 libv3270 libipc3270 libhllapi pw3270-plugin-ipc"
  43 +dev_packages="lib3270 libv3270 libipc3270"
43 44
44 -argument "install-requires" > /dev/null  
45 -if [ "$?" == "0" ]; then 45 +install_prereqs() {
46 46
47 - echo "Installing: ${packages}" 47 + local list
  48 + local package
  49 +
  50 + list="${packages}"
  51 + for package in ${dev_packages}
  52 + do
  53 + list="${list} ${package}-devel"
  54 + done
  55 +
  56 + echo "Installing: ${list}"
48 57
49 REPONUMBER=$(zypper lr | grep "${REPOSITORY_NAME}" | cut -d\| -f1) 58 REPONUMBER=$(zypper lr | grep "${REPOSITORY_NAME}" | cut -d\| -f1)
50 if [ -z "${REPONUMBER}" ]; then 59 if [ -z "${REPONUMBER}" ]; then
@@ -58,7 +67,7 @@ if [ "$?" == "0" ]; then @@ -58,7 +67,7 @@ if [ "$?" == "0" ]; then
58 exit -1 67 exit -1
59 fi 68 fi
60 69
61 - for package in ${packages} 70 + for package in ${list}
62 do 71 do
63 sudo zypper in --repo ${REPONUMBER} "${MINGW_PACKAGE_PREFIX}-${package}" 72 sudo zypper in --repo ${REPONUMBER} "${MINGW_PACKAGE_PREFIX}-${package}"
64 if [ "$?" != "0" ]; then 73 if [ "$?" != "0" ]; then
@@ -66,11 +75,9 @@ if [ "$?" == "0" ]; then @@ -66,11 +75,9 @@ if [ "$?" == "0" ]; then
66 exit -1 75 exit -1
67 fi 76 fi
68 done 77 done
69 -  
70 -fi 78 +}
71 79
72 -argument "build" > /dev/null  
73 -if [ "$?" == "0" ]; then 80 +build_package() {
74 81
75 # Build 82 # Build
76 make -C "${srcdir}" all 83 make -C "${srcdir}" all
@@ -84,6 +91,17 @@ if [ "$?" == "0" ]; then @@ -84,6 +91,17 @@ if [ "$?" == "0" ]; then
84 echo "Install failed" 91 echo "Install failed"
85 exit -1 92 exit -1
86 fi 93 fi
  94 +
  95 +}
  96 +
  97 +argument "install-requires" > /dev/null
  98 +if [ "$?" == "0" ]; then
  99 + install_prereqs
  100 +fi
  101 +
  102 +argument "build" > /dev/null
  103 +if [ "$?" == "0" ]; then
  104 + build_package
87 else 105 else
88 packages="${packages} pw3270" 106 packages="${packages} pw3270"
89 fi 107 fi
@@ -91,12 +109,16 @@ fi @@ -91,12 +109,16 @@ fi
91 unpack_rpm() { 109 unpack_rpm() {
92 110
93 local package 111 local package
  112 + local list
94 local PACKAGE_NAME 113 local PACKAGE_NAME
95 114
96 - echo "Packages: ${packages}"  
97 for package in ${packages} 115 for package in ${packages}
98 do 116 do
99 PACKAGE_NAME=$(rpm -qa | grep "${MINGW_PACKAGE_PREFIX}-${package}" | grep -v devel | head --lines=1) 117 PACKAGE_NAME=$(rpm -qa | grep "${MINGW_PACKAGE_PREFIX}-${package}" | grep -v devel | head --lines=1)
  118 + if [ -z "${PACKAGE_NAME}" ]; then
  119 + echo "No data from ${MINGW_PACKAGE_PREFIX}-${package}"
  120 + exit -1
  121 + fi
100 echo "Copy ${PACKAGE_NAME}" 122 echo "Copy ${PACKAGE_NAME}"
101 for FILE in $(rpm -ql "${PACKAGE_NAME}") 123 for FILE in $(rpm -ql "${PACKAGE_NAME}")
102 do 124 do
@@ -117,6 +139,36 @@ unpack_rpm() { @@ -117,6 +139,36 @@ unpack_rpm() {
117 done 139 done
118 140
119 done 141 done
  142 +
  143 +
  144 + for package in ${dev_packages}
  145 + do
  146 + PACKAGE_NAME=$(rpm -qa | grep "${MINGW_PACKAGE_PREFIX}-${package}" | grep devel | head --lines=1)
  147 + if [ -z "${PACKAGE_NAME}" ]; then
  148 + echo "No data from ${MINGW_PACKAGE_PREFIX}-${package}-devel"
  149 + exit -1
  150 + fi
  151 + echo "Copy ${PACKAGE_NAME}"
  152 + for FILE in $(rpm -ql "${PACKAGE_NAME}")
  153 + do
  154 + if [ ! -d ${FILE} ]; then
  155 +
  156 + FILEPATH="${buildroot}${FILE}"
  157 + mkdir -p "$(dirname ${FILEPATH})"
  158 + if [ "$?" != "0" ]; then
  159 + exit -1
  160 + fi
  161 +
  162 + cp "${FILE}" "${FILEPATH}"
  163 + if [ "$?" != "0" ]; then
  164 + echo "Cant copy '${FILE}' from '${PACKAGE_NAME}'"
  165 + exit -1
  166 + fi
  167 + fi
  168 + done
  169 +
  170 + done
  171 +
120 } 172 }
121 173
122 install_license() { 174 install_license() {
win/pw3270.nsi.in
  Diff comments   View file @eae848b
@@ -56,16 +56,16 @@ VIAddVersionKey "LegalCopyright" "(C) 2017 Banco do Brasil S/A. All Rights Reser @@ -56,16 +56,16 @@ VIAddVersionKey "LegalCopyright" "(C) 2017 Banco do Brasil S/A. All Rights Reser
56 # Interface 56 # Interface
57 57
58 !define MUI_ABORTWARNING 58 !define MUI_ABORTWARNING
59 -# !insertmacro MUI_PAGE_WELCOME 59 +!insertmacro MUI_PAGE_WELCOME
60 !insertmacro MUI_PAGE_LICENSE "share\@PRODUCT_NAME@\LICENSE" 60 !insertmacro MUI_PAGE_LICENSE "share\@PRODUCT_NAME@\LICENSE"
61 !insertmacro MUI_PAGE_COMPONENTS 61 !insertmacro MUI_PAGE_COMPONENTS
62 !insertmacro MUI_PAGE_DIRECTORY 62 !insertmacro MUI_PAGE_DIRECTORY
63 !insertmacro MUI_PAGE_INSTFILES 63 !insertmacro MUI_PAGE_INSTFILES
64 64
65 -# !insertmacro MUI_UNPAGE_WELCOME 65 +!insertmacro MUI_UNPAGE_WELCOME
66 !insertmacro MUI_UNPAGE_CONFIRM 66 !insertmacro MUI_UNPAGE_CONFIRM
67 !insertmacro MUI_UNPAGE_INSTFILES 67 !insertmacro MUI_UNPAGE_INSTFILES
68 -# !insertmacro MUI_UNPAGE_FINISH 68 +!insertmacro MUI_UNPAGE_FINISH
69 69
70 # Languages 70 # Languages
71 !insertmacro MUI_LANGUAGE "English" 71 !insertmacro MUI_LANGUAGE "English"
@@ -160,6 +160,24 @@ SubSection "@PRODUCT_NAME@" SecMain @@ -160,6 +160,24 @@ SubSection "@PRODUCT_NAME@" SecMain
160 160
161 sectionEnd 161 sectionEnd
162 162
  163 +!ifdef WITHSDK
  164 + Section /o "Software Development Kit" SDK
  165 +
  166 + setOutPath $INSTDIR\sdk
  167 + file /r "include\*.*"
  168 + file /r "lib\*.a"
  169 +
  170 + setOutPath $INSTDIR\sdk\msvc
  171 + file /r "share\@PRODUCT_NAME@\def\*.def"
  172 + file /r "share\@PRODUCT_NAME@\def\*.mak"
  173 +
  174 + SetRegView @WINARCH@
  175 + WriteRegExpandStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PW3270_SDK_PATH" "$INSTDIR\sdk"
  176 + SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
  177 +
  178 + SectionEnd
  179 +!endif
  180 +
163 !ifdef WITHCERTS 181 !ifdef WITHCERTS
164 Section "SSL Certificates" SSLCerts 182 Section "SSL Certificates" SSLCerts
165 setOutPath $INSTDIR\certs 183 setOutPath $INSTDIR\certs
@@ -249,19 +267,19 @@ Function .onInit @@ -249,19 +267,19 @@ Function .onInit
249 ClearErrors 267 ClearErrors
250 ${GetOptions} $R0 /SDK= $0 268 ${GetOptions} $R0 /SDK= $0
251 269
252 -# ${if} $0 == "YES"  
253 -#  
254 -# SectionGetFlags ${SDK} $0  
255 -# IntOp $0 $0 | ${SF_SELECTED}  
256 -# SectionSetFlags ${SDK} $0  
257 -#  
258 -# ${else}  
259 -#  
260 -# SectionGetFlags ${SDK} $0  
261 -# IntOp $0 $0 & ${SECTION_OFF}  
262 -# SectionSetFlags ${SDK} $0  
263 -#  
264 -# ${EndIf} 270 + ${if} $0 == "YES"
  271 +
  272 + SectionGetFlags ${SDK} $0
  273 + IntOp $0 $0 | ${SF_SELECTED}
  274 + SectionSetFlags ${SDK} $0
  275 +
  276 + ${else}
  277 +
  278 + SectionGetFlags ${SDK} $0
  279 + IntOp $0 $0 & ${SECTION_OFF}
  280 + SectionSetFlags ${SDK} $0
  281 +
  282 + ${EndIf}
265 283
266 Pop $0 284 Pop $0
267 !endif 285 !endif