Download as
Browse Code »

Commit 54f9f90b284eaccde09177d1787a6327c8eb7689

Authored by Perry Werneck
1 parent e87d598c
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Updating windows packaging scripts.

Showing 4 changed files with 106 additions and 95 deletions   Show diff stats
@@ -421,38 +421,18 @@ dnl --------------------------------------------------------------------------- @@ -421,38 +421,18 @@ dnl ---------------------------------------------------------------------------
421 dnl Lib3270 flags 421 dnl Lib3270 flags
422 dnl --------------------------------------------------------------------------- 422 dnl ---------------------------------------------------------------------------
423 423
424 -PKG_CHECK_MODULES( [LIB3270], [lib3270], app_cv_3270="yes", app_cv_3270="no" ) 424 +PKG_CHECK_MODULES( [LIB3270], [lib3270], AC_DEFINE(HAVE_LIB3270), AC_MSG_ERROR([ No LIB3270 devel.]) )
  425 +AC_SUBST(LIB3270_CFLAGS)
  426 +AC_SUBST(LIB3270_LIBS)
425 427
426 -if test "$app_cv_3270" == "yes"; then  
427 - AC_DEFINE(HAVE_LIB3270)  
428 - AC_SUBST(LIB3270_CFLAGS)  
429 - AC_SUBST(LIB3270_LIBS)  
430 -else  
431 - AC_MSG_ERROR([ No LIB3270 devel.])  
432 -dnl AX_SUBDIRS_CONFIGURE([modules/lib3270],[[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]])  
433 -dnl AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/modules/lib3270/src/include)  
434 -dnl AC_SUBST(LIB3270_LIBS,-l$app_cv_libname)  
435 -dnl AC_SUBST(LIB3270_INCLUDEPATH,$ac_pwd/modules/lib3270/src/include)  
436 -fi  
437 -  
438 -PKG_CHECK_MODULES( [LIBV3270], [libv3270], app_cv_v3270="yes", app_cv_v3270="no" )  
439 -  
440 -if test "$app_cv_v3270" == "yes"; then  
441 - AC_DEFINE(HAVE_LIBV3270)  
442 - AC_SUBST(LIBV3270_CFLAGS)  
443 - AC_SUBST(LIBV3270_LIBS)  
444 -else  
445 - AC_MSG_ERROR([ No V3270 widget devel.])  
446 -dnl AC_SUBST(LIBV3270_CFLAGS,-I$ac_pwd/modules/libv3270/src/include)  
447 -dnl AC_SUBST(LIBV3270_LIBS,-lv$app_cv_libname)  
448 -dnl AX_SUBDIRS_CONFIGURE([modules/libv3270],[[LIB3270_CFLAGS=-I$ac_pwd/modules/lib3270/src/include],[LIB3270_LIBS=-l$app_cv_libname],[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]])  
449 -dnl AC_SUBST(LIBV3270_INCLUDEPATH,$ac_pwd/modules/libv3270/src/include)  
450 -fi 428 +PKG_CHECK_MODULES( [LIBV3270], [libv3270], AC_DEFINE(HAVE_LIBV3270), AC_MSG_ERROR([ No V3270 devel.]) )
  429 +AC_SUBST(LIBV3270_CFLAGS)
  430 +AC_SUBST(LIBV3270_LIBS)
451 431
452 -AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname=`$PKG_CONFIG --variable=library_name lib3270` ]) 432 +AC_ARG_WITH([application-name], [AS_HELP_STRING([--with-application-name], [Set application name])], [ app_cv_appname="$withval" ],[ app_cv_appname="pw3270" ])
453 433
454 -AC_DEFINE_UNQUOTED(LIB3270_NAME,$app_cv_libname)  
455 -AC_SUBST(LIB3270_NAME,$app_cv_libname) 434 +AC_DEFINE_UNQUOTED(APPLICATION_NAME,$app_cv_appname)
  435 +AC_SUBST(APPLICATION_NAME,$app_cv_appname)
456 436
457 AC_SUBST(PW3270_CFLAGS,-I$ac_pwd/src/include) 437 AC_SUBST(PW3270_CFLAGS,-I$ac_pwd/src/include)
458 AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME) 438 AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME)
src/libpw3270cpp/Makefile.in
  Diff comments   View file @54f9f90
@@ -65,7 +65,6 @@ CFLAGS= \ @@ -65,7 +65,6 @@ CFLAGS= \
65 @CFLAGS@ \ 65 @CFLAGS@ \
66 -Wno-deprecated-declarations \ 66 -Wno-deprecated-declarations \
67 -I$(BASEDIR)/src/include \ 67 -I$(BASEDIR)/src/include \
68 - -DLIB3270_NAME="lib@LIB3270_NAME@" \  
69 @LIB3270_CFLAGS@ \ 68 @LIB3270_CFLAGS@ \
70 @DBUS_CFLAGS@ \ 69 @DBUS_CFLAGS@ \
71 @GTK_CFLAGS@ 70 @GTK_CFLAGS@
@@ -11,16 +11,12 @@ GIT_URL="https://github.com/PerryWerneck" @@ -11,16 +11,12 @@ GIT_URL="https://github.com/PerryWerneck"
11 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0}))) 11 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
12 WORKDIR=$(mktemp -d) 12 WORKDIR=$(mktemp -d)
13 PUBLISH=0 13 PUBLISH=0
14 -GET_PREREQS=0 14 +GET_PREREQS=1
15 15
16 if [ -e /etc/os-release ]; then 16 if [ -e /etc/os-release ]; then
17 . /etc/os-release 17 . /etc/os-release
18 fi 18 fi
19 19
20 -if [ -e ~/.config/pw3270.build.conf ]; then  
21 - . ~/.config/pw3270.build.conf  
22 -fi  
23 -  
24 # 20 #
25 # Limpa diretório temporário 21 # Limpa diretório temporário
26 # 22 #
@@ -37,19 +33,6 @@ failed() @@ -37,19 +33,6 @@ failed()
37 } 33 }
38 34
39 # 35 #
40 -# Get pre requisites from spec  
41 -#  
42 -getBuildRequires()  
43 -{  
44 - for required in $(grep -i buildrequires "${1}" | grep -v "%" | cut -d: -f2-)  
45 - do  
46 - echo "Installing ${required}"  
47 - sudo zypper --non-interactive --quiet in "${required}"  
48 - done  
49 -  
50 -}  
51 -  
52 -#  
53 # Get Sources from GIT 36 # Get Sources from GIT
54 # 37 #
55 getSource() 38 getSource()
@@ -64,31 +47,52 @@ getSource() @@ -64,31 +47,52 @@ getSource()
64 faile "Can't get sources for ${1}" 47 faile "Can't get sources for ${1}"
65 fi 48 fi
66 49
67 - if [ "${GET_PREREQS}" != "0" ]; then  
68 - for ARCH in ${TARGET_ARCHS}  
69 - do 50 + for ARCH in ${TARGET_ARCHS}
  51 + do
70 52
71 - if [ -d ${WORKDIR}/sources/${1}/win/${ARCH} ]; then 53 + if [ -d ${WORKDIR}/sources/${1}/win/${ARCH} ]; then
72 54
73 - for spec in $(find ${WORKDIR}/sources/${1}/win/${ARCH} -name "*.spec")  
74 - do  
75 - getBuildRequires "${spec}"  
76 - done 55 + for spec in $(find ${WORKDIR}/sources/${1}/win/${ARCH} -name "*.spec")
  56 + do
  57 + grep -i buildrequires "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' >> ${WORKDIR}/sources/pre-reqs
  58 + done
  59 +
  60 + fi
77 61
78 - fi 62 + done
79 63
  64 +}
80 65
81 - done  
82 - fi 66 +#
  67 +# Configure
  68 +#
  69 +configure()
  70 +{
83 71
84 - cd ${WORKDIR}/sources/${1} 72 + if [ "${GET_PREREQS}" != "0" ]; then
85 73
86 - NOCONFIGURE=1 ./autogen.sh  
87 - if [ "$?" != "0" ]; then  
88 - cleanup  
89 - exit -1 74 + echo -e "\e]2;Installing pre-reqs\a"
  75 + echo "Installing pre-reqs"
  76 +
  77 + for PKG in $(cat ${WORKDIR}/sources/pre-reqs | sort --unique)
  78 + do
  79 + echo "${PKG}..."
  80 + sudo zypper --non-interactive --quiet in "${PKG}"
  81 + done
90 fi 82 fi
91 83
  84 + for DIR in $(find ${WORKDIR}/sources -maxdepth 1 -type d)
  85 + do
  86 + echo ${DIR}
  87 + cd ${DIR}
  88 +
  89 + if [ -x ./autogen.sh ]; then
  90 + NOCONFIGURE=1 ./autogen.sh
  91 + if [ "$?" != "0" ]; then
  92 + failed "Erro em autogen.sh"
  93 + fi
  94 + fi
  95 + done
92 96
93 } 97 }
94 98
@@ -139,18 +143,31 @@ buildLibrary() @@ -139,18 +143,31 @@ buildLibrary()
139 143
140 cd ${WORKDIR}/sources/${1} 144 cd ${WORKDIR}/sources/${1}
141 145
142 - ./configure \ 146 + if [ -x ${PROJECTDIR}/win/configure.${1} ]; then
  147 +
  148 + HOST="${host}" \
  149 + PREFIX="${prefix}" \
  150 + BUILDDIR="{WORKDIR}/build/${ARCH}}" \
143 CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \ 151 CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \
144 LDFLAGS="-L${WORKDIR}/build/${ARCH}" \ 152 LDFLAGS="-L${WORKDIR}/build/${ARCH}" \
145 - --host=${host} \  
146 - --prefix=${prefix} \  
147 - --bindir=${WORKDIR}/build/${ARCH} \  
148 - --libdir=${WORKDIR}/build/${ARCH} \  
149 - --localedir=${WORKDIR}/build/${ARCH}/locale \  
150 - --includedir=${WORKDIR}/build/${ARCH}/include \  
151 - --sysconfdir=${WORKDIR}/build/${ARCH} \  
152 - --datadir=${WORKDIR}/build/${ARCH} \  
153 - --datarootdir=${WORKDIR}/build/${ARCH} 153 + ${PROJECTDIR}/win/configure.${1}
  154 +
  155 + else
  156 +
  157 + ./configure \
  158 + CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \
  159 + LDFLAGS="-L${WORKDIR}/build/${ARCH}" \
  160 + --host=${host} \
  161 + --prefix=${prefix} \
  162 + --bindir=${WORKDIR}/build/${ARCH} \
  163 + --libdir=${WORKDIR}/build/${ARCH} \
  164 + --localedir=${WORKDIR}/build/${ARCH}/locale \
  165 + --includedir=${WORKDIR}/build/${ARCH}/include \
  166 + --sysconfdir=${WORKDIR}/build/${ARCH} \
  167 + --datadir=${WORKDIR}/build/${ARCH} \
  168 + --datarootdir=${WORKDIR}/build/${ARCH}
  169 + fi
  170 +
154 171
155 if [ "$?" != "0" ]; then 172 if [ "$?" != "0" ]; then
156 failed "Can't configure ${1}" 173 failed "Can't configure ${1}"
@@ -211,31 +228,44 @@ buildApplication() @@ -211,31 +228,44 @@ buildApplication()
211 228
212 esac 229 esac
213 230
214 - export HOST_CC=/usr/bin/gcc  
215 -  
216 mkdir -p ${WORKDIR}/build/${ARCH} 231 mkdir -p ${WORKDIR}/build/${ARCH}
217 mkdir -p ${WORKDIR}/cache/${ARCH} 232 mkdir -p ${WORKDIR}/cache/${ARCH}
218 mkdir -p ${WORKDIR}/build/${ARCH}/locale 233 mkdir -p ${WORKDIR}/build/${ARCH}/locale
219 mkdir -p ${WORKDIR}/build/${ARCH}/include 234 mkdir -p ${WORKDIR}/build/${ARCH}/include
220 235
  236 + export HOST_CC=/usr/bin/gcc
221 export PKG_CONFIG_PATH=${WORKDIR}/build/${ARCH}/lib/pkgconfig 237 export PKG_CONFIG_PATH=${WORKDIR}/build/${ARCH}/lib/pkgconfig
222 export cache=${WORKDIR}/cache/${ARCH}/${1}.cache 238 export cache=${WORKDIR}/cache/${ARCH}/${1}.cache
223 239
224 cd ${WORKDIR}/sources/${1} 240 cd ${WORKDIR}/sources/${1}
225 241
226 - ./configure \ 242 + if [ -x ${PROJECTDIR}/win/configure.${1} ]; then
  243 +
  244 + HOST="${host}" \
  245 + PREFIX="${prefix}" \
227 CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \ 246 CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \
228 LDFLAGS="-L${WORKDIR}/build/${ARCH}" \ 247 LDFLAGS="-L${WORKDIR}/build/${ARCH}" \
229 - --host=${host} \  
230 - --prefix=${prefix} \  
231 - --bindir=${WORKDIR}/build/${ARCH} \  
232 - --libdir=${WORKDIR}/build/${ARCH} \  
233 - --localedir=${WORKDIR}/build/${ARCH}/locale \  
234 - --includedir=${WORKDIR}/build/${ARCH}/include \  
235 - --sysconfdir=${WORKDIR}/build/${ARCH} \  
236 - --datadir=${WORKDIR}/build/${ARCH} \  
237 - --datarootdir=${WORKDIR}/build/${ARCH} \  
238 - --with-application-datadir=${WORKDIR}/build/${ARCH} 248 + BUILDDIR="{WORKDIR}/build/${ARCH}}" \
  249 + ${PROJECTDIR}/win/configure.${1}
  250 +
  251 + else
  252 +
  253 + ./configure \
  254 + CFLAGS="-I${WORKDIR}/build/${ARCH}/include" \
  255 + LDFLAGS="-L${WORKDIR}/build/${ARCH}" \
  256 + --host=${host} \
  257 + --prefix=${prefix} \
  258 + --bindir=${WORKDIR}/build/${ARCH} \
  259 + --libdir=${WORKDIR}/build/${ARCH} \
  260 + --localedir=${WORKDIR}/build/${ARCH}/locale \
  261 + --includedir=${WORKDIR}/build/${ARCH}/include \
  262 + --sysconfdir=${WORKDIR}/build/${ARCH} \
  263 + --datadir=${WORKDIR}/build/${ARCH} \
  264 + --datarootdir=${WORKDIR}/build/${ARCH} \
  265 + --with-application-datadir=${WORKDIR}/build/${ARCH}
  266 +
  267 + fi
  268 +
239 269
240 if [ "$?" != "0" ]; then 270 if [ "$?" != "0" ]; then
241 failed "Can't configure ${1}" 271 failed "Can't configure ${1}"
@@ -449,8 +479,8 @@ done @@ -449,8 +479,8 @@ done
449 # 479 #
450 # Load customizations 480 # Load customizations
451 # 481 #
452 -if [ -e ${PROJECTDIR}/pw3270.win32.build.conf ]; then  
453 - . ${PROJECTDIR}/pw3270.win32.build.conf 482 +if [ -e ${PROJECTDIR}/win/pack.conf ]; then
  483 + . ${PROJECTDIR}/win/pack.conf
454 fi 484 fi
455 485
456 # 486 #
@@ -476,6 +506,8 @@ done @@ -476,6 +506,8 @@ done
476 # 506 #
477 # Build packages 507 # Build packages
478 # 508 #
  509 +configure
  510 +
479 for src in ${CORE_LIBRARIES} 511 for src in ${CORE_LIBRARIES}
480 do 512 do
481 buildLibrary ${src} 513 buildLibrary ${src}
win/pw3270.nsi.in
  Diff comments   View file @54f9f90
@@ -3,17 +3,17 @@ @@ -3,17 +3,17 @@
3 !include "FileFunc.nsh" 3 !include "FileFunc.nsh"
4 !include "LogicLib.nsh" 4 !include "LogicLib.nsh"
5 5
6 -Name "@PACKAGE@"  
7 -Caption "@PACKAGE@ - @PACKAGE_DESCRIPTION@" 6 +Name "@APPLICATION_NAME@"
  7 +Caption "@APPLICATION_NAME@ - @PACKAGE_DESCRIPTION@"
8 !ifdef WITHGTK 8 !ifdef WITHGTK
9 -outfile "@PACKAGE@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@-gtk-@GTK_MODVERSION@-@host_cpu@.exe" 9 +outfile "@APPLICATION_NAME@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@-gtk-@GTK_MODVERSION@-@host_cpu@.exe"
10 !else 10 !else
11 -outfile "@PACKAGE@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@-requires-gtk-@GTK_MODVERSION@-@host_cpu@.exe" 11 +outfile "@APPLICATION_NAME@-@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@-requires-gtk-@GTK_MODVERSION@-@host_cpu@.exe"
12 !endif 12 !endif
13 13
14 XPStyle on 14 XPStyle on
15 15
16 -installDir "$@PROGRAMFILES@\@PACKAGE@" 16 +installDir "$@PROGRAMFILES@\@APPLICATION_NAME@"
17 17
18 #define the installer icon 18 #define the installer icon
19 !define MUI_ICON "@PACKAGE@.ico" 19 !define MUI_ICON "@PACKAGE@.ico"
@@ -32,7 +32,7 @@ VIFileVersion "@WIN32_VERSION@" @@ -32,7 +32,7 @@ VIFileVersion "@WIN32_VERSION@"
32 VIAddVersionKey "ProductVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0" 32 VIAddVersionKey "ProductVersion" "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.0"
33 VIAddVersionKey "FileVersion" "@WIN32_VERSION@" 33 VIAddVersionKey "FileVersion" "@WIN32_VERSION@"
34 34
35 -VIAddVersionKey "ProductName" "sisbb" 35 +VIAddVersionKey "ProductName" "@APPLICATION_NAME@"
36 VIAddVersionKey "FileDescription" "@PACKAGE_DESCRIPTION@" 36 VIAddVersionKey "FileDescription" "@PACKAGE_DESCRIPTION@"
37 VIAddVersionKey "LegalCopyright" "GPL-2.0" 37 VIAddVersionKey "LegalCopyright" "GPL-2.0"
38 38