Commit 5a9eea8da699df2ae4b1ce0dec250b1dd8e75a4e
Exists in
master
and in
2 other branches
Merge branch 'master' into develop
Showing
2 changed files
with
9 additions
and
6 deletions
Show diff stats
win/pack.sh
@@ -90,8 +90,8 @@ clone() | @@ -90,8 +90,8 @@ clone() | ||
90 | if [ "${BUILD_UNSTABLE}" == "1" ]; then | 90 | if [ "${BUILD_UNSTABLE}" == "1" ]; then |
91 | BRANCH="develop" | 91 | BRANCH="develop" |
92 | else | 92 | else |
93 | - TEMPVAR=${1}_branch | ||
94 | - BRANCH=${!TEMPVAR} | 93 | + TEMPVAR=$(echo ${1}_branch | sed -e "s@-@@g") |
94 | + BRANCH=${!TEMPVAR} | ||
95 | fi | 95 | fi |
96 | 96 | ||
97 | echo "Cloning ${1} ${BRANCH}" | 97 | echo "Cloning ${1} ${BRANCH}" |
win/pw3270.nsi.in
@@ -142,9 +142,9 @@ SubSection "@PRODUCT_NAME@" SecMain | @@ -142,9 +142,9 @@ SubSection "@PRODUCT_NAME@" SecMain | ||
142 | 142 | ||
143 | # Locale files | 143 | # Locale files |
144 | CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES" | 144 | CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES" |
145 | - file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\@PACKAGE_NAME@.mo" | ||
146 | - file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" | ||
147 | - file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270.mo" "share\locale\pt_BR\LC_MESSAGES\libv3270.mo" | 145 | + file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\@PACKAGE_NAME@.mo" |
146 | + file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.mo" "share\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.mo" | ||
147 | + file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.mo" "share\locale\pt_BR\LC_MESSAGES\libv3270-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.mo" | ||
148 | 148 | ||
149 | # define uninstaller name | 149 | # define uninstaller name |
150 | SetRegView 32 | 150 | SetRegView 32 |
@@ -231,7 +231,7 @@ SubSection "@PRODUCT_NAME@" SecMain | @@ -231,7 +231,7 @@ SubSection "@PRODUCT_NAME@" SecMain | ||
231 | file "/oname=$INSTDIR\plugins\ipcserver.dll" "lib\@PRODUCT_NAME@-plugins\ipcserver.dll" | 231 | file "/oname=$INSTDIR\plugins\ipcserver.dll" "lib\@PRODUCT_NAME@-plugins\ipcserver.dll" |
232 | 232 | ||
233 | CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES" | 233 | CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES" |
234 | - file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libipc3270.mo" "share\locale\pt_BR\LC_MESSAGES\libipc3270.mo" | 234 | + file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libipc3270-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.mo" "share\locale\pt_BR\LC_MESSAGES\libipc3270-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.mo" |
235 | 235 | ||
236 | ${@NSISREDIR@} | 236 | ${@NSISREDIR@} |
237 | file "/oname=$SYSDIR\libipc3270.dll" "bin\libipc3270.dll" | 237 | file "/oname=$SYSDIR\libipc3270.dll" "bin\libipc3270.dll" |
@@ -254,6 +254,9 @@ SubSection "@PRODUCT_NAME@" SecMain | @@ -254,6 +254,9 @@ SubSection "@PRODUCT_NAME@" SecMain | ||
254 | # Install with "lib" prefix for compatibility. | 254 | # Install with "lib" prefix for compatibility. |
255 | file "/oname=$SYSDIR\libhllapi.dll" "bin\libhllapi.dll" | 255 | file "/oname=$SYSDIR\libhllapi.dll" "bin\libhllapi.dll" |
256 | 256 | ||
257 | + CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES" | ||
258 | + file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libhllapi-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.mo" "share\locale\pt_BR\LC_MESSAGES\libhllapi-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.mo" | ||
259 | + | ||
257 | SectionEnd | 260 | SectionEnd |
258 | !endif | 261 | !endif |
259 | 262 |