Download as
Browse Code »

Commit 6a281517baddc31103825a48782cb971800dcc47

Authored by Perry Werneck
1 parent 9fe35d8e
Exists in master and in 1 other branch develop

Updating windows package builder.

Showing 4 changed files with 86 additions and 55 deletions   Show diff stats
@@ -69,6 +69,39 @@ DLL_LDFLAGS="-shared -Wl,-soname,\$(@F)" @@ -69,6 +69,39 @@ DLL_LDFLAGS="-shared -Wl,-soname,\$(@F)"
69 DEPENDS="" 69 DEPENDS=""
70 70
71 dnl --------------------------------------------------------------------------- 71 dnl ---------------------------------------------------------------------------
  72 +dnl Version info
  73 +dnl ---------------------------------------------------------------------------
  74 +
  75 +AC_SUBST(PACKAGE_DESCRIPTION,"PW3270 HLLAPI Module")
  76 +
  77 +app_vrs_major=$(echo $VERSION | cut -d. -f1)
  78 +app_vrs_minor=$(echo $VERSION | cut -d. -f2)
  79 +
  80 +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
  81 +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
  82 +
  83 +AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
  84 +AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
  85 +
  86 +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
  87 +
  88 +app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
  89 +app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
  90 +
  91 +AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release)
  92 +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major)
  93 +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor)
  94 +
  95 +AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
  96 +AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
  97 +AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
  98 +
  99 +AC_ARG_WITH([application-datadir], [AS_HELP_STRING([--with-application-datadir], [Set path for configuration file])], [ app_cv_source_appdatadir="$withval" ],[ app_cv_source_appdatadir="\$(datarootdir)/\$(PACKAGE_NAME)" ])
  100 +
  101 +AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)
  102 +AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)
  103 +
  104 +dnl ---------------------------------------------------------------------------
72 dnl Check for OS specifics 105 dnl Check for OS specifics
73 dnl --------------------------------------------------------------------------- 106 dnl ---------------------------------------------------------------------------
74 107
@@ -99,6 +132,8 @@ case "$host" in @@ -99,6 +132,8 @@ case "$host" in
99 132
100 AC_SUBST(PROGRAMFILES,$app_cv_programfiles) 133 AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
101 AC_SUBST(WINARCH,$app_cv_winarch) 134 AC_SUBST(WINARCH,$app_cv_winarch)
  135 + AC_SUBST(SONAME,hllapi.dll)
  136 +
102 ;; 137 ;;
103 138
104 *) 139 *)
@@ -109,6 +144,7 @@ case "$host" in @@ -109,6 +144,7 @@ case "$host" in
109 app_cv_osname="linux" 144 app_cv_osname="linux"
110 LOGDIR="/var/log" 145 LOGDIR="/var/log"
111 DLLEXT=".so" 146 DLLEXT=".so"
  147 + AC_SUBST(SONAME,libhllapi.so.$app_vrs_major.$app_vrs_minor)
112 148
113 esac 149 esac
114 150
@@ -133,48 +169,6 @@ AC_PATH_TOOL([VALGRIND], [valgrind], [no]) @@ -133,48 +169,6 @@ AC_PATH_TOOL([VALGRIND], [valgrind], [no])
133 PKG_CHECK_EXISTS 169 PKG_CHECK_EXISTS
134 170
135 dnl --------------------------------------------------------------------------- 171 dnl ---------------------------------------------------------------------------
136 -dnl Version info  
137 -dnl ---------------------------------------------------------------------------  
138 -  
139 -AC_SUBST(PACKAGE_DESCRIPTION,"PW3270 HLLAPI Module")  
140 -  
141 -app_vrs_major=$(echo $VERSION | cut -d. -f1)  
142 -app_vrs_minor=$(echo $VERSION | cut -d. -f2)  
143 -  
144 -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)  
145 -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)  
146 -  
147 -AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)  
148 -AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)  
149 -  
150 -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])  
151 -  
152 -app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)  
153 -app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)  
154 -  
155 -AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release)  
156 -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major)  
157 -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor)  
158 -  
159 -AC_SUBST(PACKAGE_RELEASE,$app_cv_release)  
160 -AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)  
161 -AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)  
162 -  
163 -case "$host" in  
164 - *-mingw32|*-pc-msys)  
165 - AC_SUBST(SONAME,hllapi.dll)  
166 - ;;  
167 -  
168 - s390x-*)  
169 - AC_SUBST(SONAME,libhllapi.so)  
170 - ;;  
171 -  
172 - *)  
173 - AC_SUBST(SONAME,libhllapi.so.$app_vrs_major.$app_vrs_minor)  
174 -  
175 -esac  
176 -  
177 -dnl ---------------------------------------------------------------------------  
178 dnl Check for doxygen 172 dnl Check for doxygen
179 dnl --------------------------------------------------------------------------- 173 dnl ---------------------------------------------------------------------------
180 174
win/hllapi.nsi
  Diff comments   View file @6a28151
@@ -17,10 +17,10 @@ RequestExecutionLevel admin @@ -17,10 +17,10 @@ RequestExecutionLevel admin
17 17
18 # Properties 18 # Properties
19 VIProductVersion "5.2.19.8" 19 VIProductVersion "5.2.19.8"
20 -VIFileVersion "19.8.13.14" 20 +VIFileVersion "19.8.30.16"
21 21
22 VIAddVersionKey "ProductVersion" "5.2.19.8" 22 VIAddVersionKey "ProductVersion" "5.2.19.8"
23 -VIAddVersionKey "FileVersion" "19.8.13.14" 23 +VIAddVersionKey "FileVersion" "19.8.30.16"
24 24
25 VIAddVersionKey "ProductName" "hllapi" 25 VIAddVersionKey "ProductName" "hllapi"
26 VIAddVersionKey "FileDescription" "PW3270 HLLAPI Module" 26 VIAddVersionKey "FileDescription" "PW3270 HLLAPI Module"
@@ -30,7 +30,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0" @@ -30,7 +30,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0"
30 30
31 !define MUI_ABORTWARNING 31 !define MUI_ABORTWARNING
32 # !insertmacro MUI_PAGE_WELCOME 32 # !insertmacro MUI_PAGE_WELCOME
33 -!insertmacro MUI_PAGE_LICENSE "..\LICENSE" 33 +!insertmacro MUI_PAGE_LICENSE "LICENSE"
34 !insertmacro MUI_PAGE_COMPONENTS 34 !insertmacro MUI_PAGE_COMPONENTS
35 !insertmacro MUI_PAGE_DIRECTORY 35 !insertmacro MUI_PAGE_DIRECTORY
36 !insertmacro MUI_PAGE_INSTFILES 36 !insertmacro MUI_PAGE_INSTFILES
@@ -58,7 +58,10 @@ SubSection "hllapi" SecMain @@ -58,7 +58,10 @@ SubSection "hllapi" SecMain
58 setOutPath $SYSDIR 58 setOutPath $SYSDIR
59 SetShellVarContext all 59 SetShellVarContext all
60 60
61 - file "/oname=$SYSDIR\hllapi.dll" "..\.bin\Release\hllapi.dll" 61 + file "/oname=$SYSDIR\hllapi.dll" "libhllapi.dll"
  62 +
  63 + # For compatibility with old scripts.
  64 + file "/oname=$SYSDIR\libhllapi.dll" "libhllapi.dll"
62 65
63 # define uninstaller name 66 # define uninstaller name
64 SetRegView 32 67 SetRegView 32
@@ -97,6 +100,7 @@ Section "Uninstall" @@ -97,6 +100,7 @@ Section "Uninstall"
97 100
98 # delete installed files 101 # delete installed files
99 delete $SYSDIR\hllapi.dll 102 delete $SYSDIR\hllapi.dll
  103 + delete $SYSDIR\libhllapi.dll
100 104
101 # Remove registry 105 # Remove registry
102 SetRegView 32 106 SetRegView 32
win/hllapi.nsi.in
  Diff comments   View file @6a28151
@@ -30,7 +30,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0" @@ -30,7 +30,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0"
30 30
31 !define MUI_ABORTWARNING 31 !define MUI_ABORTWARNING
32 # !insertmacro MUI_PAGE_WELCOME 32 # !insertmacro MUI_PAGE_WELCOME
33 -!insertmacro MUI_PAGE_LICENSE "..\LICENSE" 33 +!insertmacro MUI_PAGE_LICENSE "LICENSE"
34 !insertmacro MUI_PAGE_COMPONENTS 34 !insertmacro MUI_PAGE_COMPONENTS
35 !insertmacro MUI_PAGE_DIRECTORY 35 !insertmacro MUI_PAGE_DIRECTORY
36 !insertmacro MUI_PAGE_INSTFILES 36 !insertmacro MUI_PAGE_INSTFILES
@@ -58,10 +58,10 @@ SubSection "@PACKAGE@" SecMain @@ -58,10 +58,10 @@ SubSection "@PACKAGE@" SecMain
58 setOutPath $SYSDIR 58 setOutPath $SYSDIR
59 SetShellVarContext all 59 SetShellVarContext all
60 60
61 - file "/oname=$SYSDIR\hllapi.dll" "..\.bin\Release\hllapi.dll" 61 + file "/oname=$SYSDIR\hllapi.dll" "libhllapi.dll"
62 62
63 # For compatibility with old scripts. 63 # For compatibility with old scripts.
64 - file "/oname=$SYSDIR\libhllapi.dll" "..\.bin\Release\hllapi.dll" 64 + file "/oname=$SYSDIR\libhllapi.dll" "libhllapi.dll"
65 65
66 # define uninstaller name 66 # define uninstaller name
67 SetRegView 32 67 SetRegView 32
1 #!/bin/bash 1 #!/bin/bash
2 -cd $(dirname $(dirname $(readlink -f $0))) 2 +PROJECT_DIR=$(readlink -f $(dirname $(dirname $(readlink -f $0))))
3 3
4 PUBLISH=0 4 PUBLISH=0
5 5
@@ -7,10 +7,22 @@ pack() { @@ -7,10 +7,22 @@ pack() {
7 7
8 echo -e "\e]2;hllapi-${1}\a" 8 echo -e "\e]2;hllapi-${1}\a"
9 9
  10 + cd ${PROJECT_DIR}
  11 +
  12 + BUILDDIR=$(mktemp -d)
  13 +
10 ./configure --cache=.${1}.cache \ 14 ./configure --cache=.${1}.cache \
11 --host=${1}-w64-mingw32 \ 15 --host=${1}-w64-mingw32 \
12 --prefix=/usr/${1}-w64-mingw32/sys-root/mingw \ 16 --prefix=/usr/${1}-w64-mingw32/sys-root/mingw \
13 - --libdir=/usr/${1}-w64-mingw32/sys-root/mingw/lib 17 + --bindir=${BUILDDIR} \
  18 + --libdir=${BUILDDIR} \
  19 + --localedir=${BUILDDIR} \
  20 + --includedir=${BUILDDIR} \
  21 + --sysconfdir=${BUILDDIR} \
  22 + --datadir=${BUILDDIR} \
  23 + --datarootdir=${BUILDDIR} \
  24 + --with-application-datadir=${BUILDDIR}
  25 +
14 26
15 if [ "$?" != "0" ]; then 27 if [ "$?" != "0" ]; then
16 exit -1 28 exit -1
@@ -26,24 +38,45 @@ pack() { @@ -26,24 +38,45 @@ pack() {
26 exit -1 38 exit -1
27 fi 39 fi
28 40
29 - makensis win/hllapi.nsi 41 + make install
  42 + if [ "$?" != "0" ]; then
  43 + exit -1
  44 + fi
  45 +
  46 + NSI=$(readlink -f win/hllapi.nsi)
  47 +
  48 + cp LICENSE ${BUILDDIR}
  49 +
  50 + cd ${BUILDDIR}
  51 +
  52 + makensis -NOCD ${NSI}
  53 + if [ "$?" != "0" ]; then
  54 + exit -1
  55 + fi
30 56
31 if [ -d ~/public_html ]; then 57 if [ -d ~/public_html ]; then
32 mkdir -p ~/public_html/win 58 mkdir -p ~/public_html/win
33 - cp -v ./win/*.exe ~/public_html/win 59 + cp -v *.exe ~/public_html/win
34 if [ "$?" != "0" ]; then 60 if [ "$?" != "0" ]; then
35 exit -1 61 exit -1
36 fi 62 fi
37 fi 63 fi
38 64
39 if [ "${PUBLISH}" == "1" ] && [ ! -z ${WIN_PACKAGE_SERVER} ]; then 65 if [ "${PUBLISH}" == "1" ] && [ ! -z ${WIN_PACKAGE_SERVER} ]; then
40 - scp ./win/*.exe ${WIN_PACKAGE_SERVER} 66 + scp *.exe ${WIN_PACKAGE_SERVER}
41 if [ "$?" != "0" ]; then 67 if [ "$?" != "0" ]; then
42 exit -1 68 exit -1
43 fi 69 fi
44 fi 70 fi
45 71
46 - rm -fr $TEMPDIR 72 + mv -f *.exe ${PROJECT_DIR}
  73 + if [ "$?" != "0" ]; then
  74 + exit -1
  75 + fi
  76 +
  77 +
  78 + cd ${PROJECT_DIR}
  79 + rm -fr ${BUILDDIR}
47 rm -fr .${1}.cache 80 rm -fr .${1}.cache
48 81
49 } 82 }