Download as
Browse Code »

Commit fa2e1959b00407a6109571105e88c4a5f4131045

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

Fixing windows customized build

Showing 7 changed files with 35 additions and 26 deletions   Show diff stats
@@ -45,7 +45,6 @@ localedir=${datarootdir}/locale @@ -45,7 +45,6 @@ localedir=${datarootdir}/locale
45 docdir=@docdir@ 45 docdir=@docdir@
46 sysconfdir=@sysconfdir@ 46 sysconfdir=@sysconfdir@
47 mandir=@mandir@ 47 mandir=@mandir@
48 -APPDATADIR=@APPDATADIR@  
49 48
50 BASEDIR=@BASEDIR@ 49 BASEDIR=@BASEDIR@
51 50
@@ -175,7 +174,7 @@ $(POTDIR)/%.pot: \ @@ -175,7 +174,7 @@ $(POTDIR)/%.pot: \
175 @$(MAKE) -C src/$(basename $(notdir $@)) $@ 174 @$(MAKE) -C src/$(basename $(notdir $@)) $@
176 175
177 $(POTDIR)/%.pot: \ 176 $(POTDIR)/%.pot: \
178 - $(APPDATADIR)/pot/%.pot 177 + $(datarootdir)/$(PRODUCT_NAME)/pot/%.pot
179 178
180 @echo $(notdir $@) ... 179 @echo $(notdir $@) ...
181 @mkdir -p `dirname $@` 180 @mkdir -p `dirname $@`
branding/Makefile.in
  Diff comments   View file @fa2e195
@@ -27,11 +27,11 @@ @@ -27,11 +27,11 @@
27 PACKAGE_NAME=@PACKAGE_NAME@ 27 PACKAGE_NAME=@PACKAGE_NAME@
28 PACKAGE_VERSION=@PACKAGE_VERSION@ 28 PACKAGE_VERSION=@PACKAGE_VERSION@
29 PACKAGE_TARNAME=@PACKAGE_TARNAME@ 29 PACKAGE_TARNAME=@PACKAGE_TARNAME@
  30 +PRODUCT_NAME=@PRODUCT_NAME@
30 31
31 prefix=@prefix@ 32 prefix=@prefix@
32 exec_prefix=@exec_prefix@ 33 exec_prefix=@exec_prefix@
33 datarootdir=@datarootdir@ 34 datarootdir=@datarootdir@
34 -APPDATADIR=@APPDATADIR@  
35 35
36 BASEDIR=@BASEDIR@ 36 BASEDIR=@BASEDIR@
37 SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/branding 37 SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/branding
@@ -73,7 +73,7 @@ $(BINDIR)/%.png: \ @@ -73,7 +73,7 @@ $(BINDIR)/%.png: \
73 @$(MKDIR) `dirname $@` 73 @$(MKDIR) `dirname $@`
74 @$(OPTIPNG) -out $@ -o7 $< 74 @$(OPTIPNG) -out $@ -o7 $<
75 75
76 -$(DESTDIR)$(APPDATADIR)/%.png: \ 76 +$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.png: \
77 $(BINDIR)/%.png 77 $(BINDIR)/%.png
78 78
79 @echo $@ ... 79 @echo $@ ...
@@ -88,9 +88,9 @@ $(DESTDIR)$(datarootdir)/pixmaps/%.png: \ @@ -88,9 +88,9 @@ $(DESTDIR)$(datarootdir)/pixmaps/%.png: \
88 @$(INSTALL_DATA) $< $@ 88 @$(INSTALL_DATA) $< $@
89 89
90 install: \ 90 install: \
91 - $(DESTDIR)$(APPDATADIR)/$(PACKAGE_NAME).png \ 91 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME).png \
92 $(DESTDIR)$(datarootdir)/pixmaps/$(PACKAGE_TARNAME).png \ 92 $(DESTDIR)$(datarootdir)/pixmaps/$(PACKAGE_TARNAME).png \
93 - $(DESTDIR)$(APPDATADIR)/$(PACKAGE_NAME)-logo.png 93 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME)-logo.png
94 94
95 @$(INSTALL_DATA) \ 95 @$(INSTALL_DATA) \
96 launcher.desktop \ 96 launcher.desktop \
@@ -103,16 +103,6 @@ AC_SUBST(PACKAGE_RELEASE,$app_cv_release) @@ -103,16 +103,6 @@ AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
103 AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major) 103 AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
104 AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor) 104 AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
105 105
106 -AC_ARG_WITH([source-locales], [AS_HELP_STRING([--with-source-locales], [Set path for lib3270 locale sources])], [ app_cv_source_locales="$withval" ],[ app_cv_source_locales="/usr/share/`pkg-config --variable=product_name lib3270`/pot" ])  
107 -  
108 -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)/`pkg-config --variable=product_name lib3270`" ])  
109 -  
110 -AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)  
111 -AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)  
112 -  
113 -AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)  
114 -AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)  
115 -  
116 AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name lib3270` ]) 106 AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name lib3270` ])
117 AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) 107 AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
118 AC_SUBST(PRODUCT_NAME,$app_cv_product) 108 AC_SUBST(PRODUCT_NAME,$app_cv_product)
locale/Makefile.in
  Diff comments   View file @fa2e195
@@ -31,11 +31,11 @@ prefix=@prefix@ @@ -31,11 +31,11 @@ prefix=@prefix@
31 exec_prefix=@exec_prefix@ 31 exec_prefix=@exec_prefix@
32 datarootdir=@datarootdir@ 32 datarootdir=@datarootdir@
33 localedir=${datarootdir}/locale 33 localedir=${datarootdir}/locale
34 -APPDATADIR=@APPDATADIR@  
35 34
36 PACKAGE_NAME=@PACKAGE_NAME@ 35 PACKAGE_NAME=@PACKAGE_NAME@
37 PACKAGE_VERSION=@PACKAGE_VERSION@ 36 PACKAGE_VERSION=@PACKAGE_VERSION@
38 PACKAGE_TARNAME=@PACKAGE_TARNAME@ 37 PACKAGE_TARNAME=@PACKAGE_TARNAME@
  38 +PRODUCT_NAME=@PRODUCT_NAME@
39 39
40 BASEDIR=@BASEDIR@ 40 BASEDIR=@BASEDIR@
41 BINDIR=$(BASEDIR)/.bin/locale 41 BINDIR=$(BASEDIR)/.bin/locale
@@ -78,9 +78,9 @@ all: \ @@ -78,9 +78,9 @@ all: \
78 install: \ 78 install: \
79 $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) 79 $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo)
80 80
81 - @$(MKDIR) $(DESTDIR)$(APPDATADIR)/locale  
82 - @$(INSTALL_DATA) *.po $(DESTDIR)$(APPDATADIR)/locale  
83 - @$(INSTALL_DATA) $(PACKAGE_NAME).pot $(DESTDIR)$(APPDATADIR)/locale  
84 - @$(INSTALL_DATA) Makefile $(DESTDIR)$(APPDATADIR)/locale 81 + @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale
  82 + @$(INSTALL_DATA) *.po $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale
  83 + @$(INSTALL_DATA) $(PACKAGE_NAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale
  84 + @$(INSTALL_DATA) Makefile $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/locale
85 85
86 86
locale/pw3270.pot
  Diff comments   View file @fa2e195
@@ -9,7 +9,7 @@ msgstr &quot;&quot; @@ -9,7 +9,7 @@ msgstr &quot;&quot;
9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
11 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2019-09-06 10:59-0300\n" 12 +"POT-Creation-Date: 2019-09-06 15:13-0300\n"
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
ui/Makefile.in
  Diff comments   View file @fa2e195
@@ -32,11 +32,11 @@ SOURCES=xml2pot.c @@ -32,11 +32,11 @@ SOURCES=xml2pot.c
32 prefix=@prefix@ 32 prefix=@prefix@
33 exec_prefix=@exec_prefix@ 33 exec_prefix=@exec_prefix@
34 datarootdir=@datarootdir@ 34 datarootdir=@datarootdir@
35 -APPDATADIR=@APPDATADIR@  
36 35
37 PACKAGE_NAME=@PACKAGE_NAME@ 36 PACKAGE_NAME=@PACKAGE_NAME@
38 PACKAGE_VERSION=@PACKAGE_VERSION@ 37 PACKAGE_VERSION=@PACKAGE_VERSION@
39 PACKAGE_TARNAME=@PACKAGE_TARNAME@ 38 PACKAGE_TARNAME=@PACKAGE_TARNAME@
  39 +PRODUCT_NAME=@PRODUCT_NAME@
40 40
41 BASEDIR=@BASEDIR@ 41 BASEDIR=@BASEDIR@
42 POTDIR=$(BASEDIR)/.pot/ui 42 POTDIR=$(BASEDIR)/.pot/ui
@@ -104,8 +104,8 @@ Release: \ @@ -104,8 +104,8 @@ Release: \
104 104
105 install: 105 install:
106 106
107 - @$(MKDIR) $(DESTDIR)$(APPDATADIR)/ui  
108 - @$(INSTALL_DATA) *.xml $(DESTDIR)$(APPDATADIR)/ui 107 + @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/ui
  108 + @$(INSTALL_DATA) *.xml $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/ui
109 109
110 $(SRCDIR): \ 110 $(SRCDIR): \
111 clean 111 clean
@@ -302,6 +302,7 @@ buildApplication() @@ -302,6 +302,7 @@ buildApplication()
302 302
303 make all 303 make all
304 if [ "$?" != "0" ]; then 304 if [ "$?" != "0" ]; then
  305 + /bin/bash
305 failed "Can't buid ${1}" 306 failed "Can't buid ${1}"
306 fi 307 fi
307 308
@@ -390,6 +391,16 @@ makeInstaller() @@ -390,6 +391,16 @@ makeInstaller()
390 { 391 {
391 NSIS_ARGS="-DWITHGTK" 392 NSIS_ARGS="-DWITHGTK"
392 393
  394 + if [ -d ${WORKDIR}/build/${ARCH}/certs ]; then
  395 + NSIS_ARGS="${NSIS_ARGS} -DWITHCERTS"
  396 +
  397 + SSL_CERT_DIR=${WORKDIR}/build/${ARCH}/certs c_rehash
  398 + if [ "$?" != "0" ]; then
  399 + failed "Error on c_rehash"
  400 + fi
  401 +
  402 + fi
  403 +
393 if [ ! -z "${PACKAGE_PLUGINS}" ]; then 404 if [ ! -z "${PACKAGE_PLUGINS}" ]; then
394 NSIS_ARGS="${NSIS_ARGS} -DWITHPLUGINS" 405 NSIS_ARGS="${NSIS_ARGS} -DWITHPLUGINS"
395 fi 406 fi
@@ -506,6 +517,10 @@ do @@ -506,6 +517,10 @@ do
506 PRODUCT_NAME=${value} 517 PRODUCT_NAME=${value}
507 ;; 518 ;;
508 519
  520 + SOURCES-FROM)
  521 + GIT_URL=${value}
  522 + ;;
  523 +
509 ADD-REPOS) 524 ADD-REPOS)
510 addRepos 525 addRepos
511 exit 0 526 exit 0
@@ -518,6 +533,10 @@ do @@ -518,6 +533,10 @@ do
518 533
519 ;; 534 ;;
520 535
  536 + TARGET-ARCHS)
  537 + TARGET_ARCHS=${value}
  538 + ;;
  539 +
521 PROJECT-PATH) 540 PROJECT-PATH)
522 PROJECTDIR=$(readlink -f ${value}) 541 PROJECTDIR=$(readlink -f ${value})
523 ;; 542 ;;
@@ -531,6 +550,7 @@ do @@ -531,6 +550,7 @@ do
531 550
532 echo " --product-name Set the product name (current is ${PRODUCT_NAME})" 551 echo " --product-name Set the product name (current is ${PRODUCT_NAME})"
533 echo " --project-path Set the path for the customization data" 552 echo " --project-path Set the path for the customization data"
  553 + echo " --target-archs Set the target architectures (current are ${TARGET_ARCHS})"
534 554
535 if [ ! -z ${WIN_PACKAGE_SERVER} ]; then 555 if [ ! -z ${WIN_PACKAGE_SERVER} ]; then
536 echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}" 556 echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}"
@@ -539,7 +559,7 @@ do @@ -539,7 +559,7 @@ do
539 559
540 560
541 if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then 561 if [ -d ~/public_html/win/${PRODUCT_NAME} ]; then
542 - echo " --clear Remove ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}" 562 + echo " --clear Replace the contents of ~/public_html/win/${PRODUCT_NAME}/{x86_32,x86_64}"
543 fi 563 fi
544 564
545 echo "" 565 echo ""