Commit 093946dc8bb2bc771eb33cbe566992819371a847
1 parent
fa2e1959
Exists in
master
and in
5 other branches
Implementing windows package customizations.
Showing
3 changed files
with
26 additions
and
7 deletions
Show diff stats
configure.ac
@@ -107,6 +107,10 @@ AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product | @@ -107,6 +107,10 @@ AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product | ||
107 | AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) | 107 | AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) |
108 | AC_SUBST(PRODUCT_NAME,$app_cv_product) | 108 | AC_SUBST(PRODUCT_NAME,$app_cv_product) |
109 | 109 | ||
110 | +AC_ARG_WITH([library-name], [AS_HELP_STRING([--with-library-name], [Set protocol library name])], [ app_cv_library="$withval" ],[ app_cv_library=`pkg-config --variable=library_name lib3270` ]) | ||
111 | +AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library) | ||
112 | +AC_SUBST(LIBRARY_NAME,$app_cv_library) | ||
113 | + | ||
110 | dnl --------------------------------------------------------------------------- | 114 | dnl --------------------------------------------------------------------------- |
111 | dnl Check for OS specifics | 115 | dnl Check for OS specifics |
112 | dnl --------------------------------------------------------------------------- | 116 | dnl --------------------------------------------------------------------------- |
win/pack.sh
@@ -165,7 +165,7 @@ buildLibrary() | @@ -165,7 +165,7 @@ buildLibrary() | ||
165 | 165 | ||
166 | host="${host}" \ | 166 | host="${host}" \ |
167 | prefix="${prefix}" \ | 167 | prefix="${prefix}" \ |
168 | - BUILDDIR="${WORKDIR}/build/${ARCH}}" \ | 168 | + BUILDDIR="${WORKDIR}/build/${ARCH}" \ |
169 | CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \ | 169 | CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \ |
170 | LDFLAGS="-L${WORKDIR}/build/${ARCH}" \ | 170 | LDFLAGS="-L${WORKDIR}/build/${ARCH}" \ |
171 | ${PROJECTDIR}/win/configure.${1} | 171 | ${PROJECTDIR}/win/configure.${1} |
@@ -290,8 +290,7 @@ buildApplication() | @@ -290,8 +290,7 @@ buildApplication() | ||
290 | --includedir=${WORKDIR}/build/${ARCH}/include \ | 290 | --includedir=${WORKDIR}/build/${ARCH}/include \ |
291 | --sysconfdir=${WORKDIR}/build/${ARCH} \ | 291 | --sysconfdir=${WORKDIR}/build/${ARCH} \ |
292 | --datadir=${WORKDIR}/build/${ARCH} \ | 292 | --datadir=${WORKDIR}/build/${ARCH} \ |
293 | - --datarootdir=${WORKDIR}/build/${ARCH} \ | ||
294 | - --with-application-datadir=${WORKDIR}/build/${ARCH} | 293 | + --datarootdir=${WORKDIR}/build/${ARCH} |
295 | 294 | ||
296 | fi | 295 | fi |
297 | 296 | ||
@@ -391,14 +390,23 @@ makeInstaller() | @@ -391,14 +390,23 @@ makeInstaller() | ||
391 | { | 390 | { |
392 | NSIS_ARGS="-DWITHGTK" | 391 | NSIS_ARGS="-DWITHGTK" |
393 | 392 | ||
394 | - if [ -d ${WORKDIR}/build/${ARCH}/certs ]; then | 393 | + if [ -d ${WORKDIR}/certs ]; then |
395 | NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS" | 394 | NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS" |
396 | 395 | ||
397 | - SSL_CERT_DIR=${WORKDIR}/build/${ARCH}/certs c_rehash | 396 | + export SSL_CERT_DIR=${WORKDIR}/build/${ARCH}/sslcerts |
397 | + | ||
398 | + mkdir -p ${SSL_CERT_DIR} | ||
399 | + cp -rv ${WORKDIR}/certs ${SSL_CERT_DIR} | ||
400 | + if [ "$?" != "0" ]; then | ||
401 | + failed "Can't copy certs" | ||
402 | + fi | ||
403 | + | ||
404 | + c_rehash | ||
398 | if [ "$?" != "0" ]; then | 405 | if [ "$?" != "0" ]; then |
399 | - failed "Error on c_rehash" | 406 | + failed "Can't hash certs" |
400 | fi | 407 | fi |
401 | 408 | ||
409 | + | ||
402 | fi | 410 | fi |
403 | 411 | ||
404 | if [ ! -z "${PACKAGE_PLUGINS}" ]; then | 412 | if [ ! -z "${PACKAGE_PLUGINS}" ]; then |
win/pw3270.nsi.in
@@ -74,7 +74,7 @@ SubSection "@PACKAGE@" SecMain | @@ -74,7 +74,7 @@ SubSection "@PACKAGE@" SecMain | ||
74 | # Binary files | 74 | # Binary files |
75 | file "/oname=$INSTDIR\@PRODUCT_NAME@.exe" "@PACKAGE@.exe" | 75 | file "/oname=$INSTDIR\@PRODUCT_NAME@.exe" "@PACKAGE@.exe" |
76 | file "/oname=$INSTDIR\@PRODUCT_NAME@.ico" "@PACKAGE@.ico" | 76 | file "/oname=$INSTDIR\@PRODUCT_NAME@.ico" "@PACKAGE@.ico" |
77 | - file "/oname=$INSTDIR\lib3270.dll" "lib3270.dll" | 77 | + file "/oname=$INSTDIR\@LIBRARY_NAME@.dll" "@LIBRARY_NAME@.dll" |
78 | file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll" | 78 | file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll" |
79 | file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll" | 79 | file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll" |
80 | 80 | ||
@@ -134,6 +134,13 @@ SubSection "@PACKAGE@" SecMain | @@ -134,6 +134,13 @@ SubSection "@PACKAGE@" SecMain | ||
134 | 134 | ||
135 | sectionEnd | 135 | sectionEnd |
136 | 136 | ||
137 | +!ifdef WITHCERTS | ||
138 | + Section "SSL Certificates" SecCerts | ||
139 | + setOutPath $INSTDIR\certs | ||
140 | + file /r "certs\*.*" | ||
141 | + sectionEnd | ||
142 | +!endif | ||
143 | + | ||
137 | !ifdef WITHPLUGINS | 144 | !ifdef WITHPLUGINS |
138 | SubSection "Plugins" SecPLugin | 145 | SubSection "Plugins" SecPLugin |
139 | 146 |