Download as
Browse Code »

Commit 368dc170c3a2a945579eef0ec5585fe0b8da6e4c

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

Corrigindo empacotamento python para windows.

Showing 9 changed files with 83 additions and 20 deletions   Show diff stats
@@ -238,15 +238,13 @@ endif @@ -238,15 +238,13 @@ endif
238 238
239 package: Release 239 package: Release
240 ifneq ($(MAKENSIS),no) 240 ifneq ($(MAKENSIS),no)
241 - @make -C nsi $(PACKAGE_NAME)-@host_cpu@.nsi  
242 @chmod +x makegtkruntime.sh 241 @chmod +x makegtkruntime.sh
243 @echo " GEN GTK Runtime" 242 @echo " GEN GTK Runtime"
244 @./makegtkruntime.sh 243 @./makegtkruntime.sh
245 @echo " GEN Windows installer" 244 @echo " GEN Windows installer"
246 @cp -rv $(BINDIR)/Release/$(localedir) $(BINDIR)/Release 245 @cp -rv $(BINDIR)/Release/$(localedir) $(BINDIR)/Release
247 - @cat nsi/$(PACKAGE_NAME)-@host_cpu@.nsi | "$(MAKENSIS)" \  
248 - -DLOCALEDIR="$(BINDIR)/Release$(localedir)" \  
249 - -Onsis.log - 246 + @make -C nsi package-no-gtk
  247 + @make -C nsi package
250 endif 248 endif
251 249
252 ifneq ($(DPKGBUILD),no) 250 ifneq ($(DPKGBUILD),no)
nsi/Makefile.in
  Diff comments   View file @368dc17
@@ -40,7 +40,7 @@ EXTENSIONS=@EXTENSIONS@ @@ -40,7 +40,7 @@ EXTENSIONS=@EXTENSIONS@
40 #---[ Tools ]------------------------------------------------------------------ 40 #---[ Tools ]------------------------------------------------------------------
41 41
42 MAKENSIS=@MAKENSIS@ 42 MAKENSIS=@MAKENSIS@
43 - 43 +MKDIR=@MKDIR_P@
44 44
45 #---[ Rules ]------------------------------------------------------------------ 45 #---[ Rules ]------------------------------------------------------------------
46 46
@@ -56,8 +56,19 @@ $(PACKAGE_NAME).nsi: \ @@ -56,8 +56,19 @@ $(PACKAGE_NAME).nsi: \
56 $(PACKAGE_NAME)-$(HOST_CPU).nsi 56 $(PACKAGE_NAME)-$(HOST_CPU).nsi
57 @cp $^ $@ 57 @cp $^ $@
58 58
  59 +package: \
  60 + $(PACKAGE_NAME)-$(HOST_CPU).nsi
59 61
60 -$(PACKAGE_NAME)-$(HOST_CPU).nsi: \ 62 + @echo "Installer for $(PACKAGE_NAME)-$(HOST_CPU)..."
  63 + @$(MAKENSIS) $(PACKAGE_NAME)-$(HOST_CPU).nsi
  64 +
  65 +package-no-gtk: \
  66 + $(PACKAGE_NAME)-$(HOST_CPU)-no-gtk.nsi
  67 +
  68 + @echo "Installer for $(PACKAGE_NAME)-$(HOST_CPU)-no-gtk..."
  69 + @$(MAKENSIS) $(PACKAGE_NAME)-$(HOST_CPU)-no-gtk.nsi
  70 +
  71 +.tmp/prefix-$(HOST_CPU).nsi: \
61 header-$(HOST_CPU).nsi \ 72 header-$(HOST_CPU).nsi \
62 main-begin-$(HOST_CPU).nsi \ 73 main-begin-$(HOST_CPU).nsi \
63 main-end.nsi \ 74 main-end.nsi \
@@ -66,10 +77,13 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \ @@ -66,10 +77,13 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
66 uninstall-$(HOST_CPU).nsi \ 77 uninstall-$(HOST_CPU).nsi \
67 oninit-$(HOST_CPU).nsi \ 78 oninit-$(HOST_CPU).nsi \
68 $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) \ 79 $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) \
  80 + $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension-init.nsi ) \
69 $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi ) 81 $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi )
70 82
  83 + @$(MKDIR) `dirname $@`
  84 +
71 @rm -f $@ 85 @rm -f $@
72 - @cat header-$(HOST_CPU).nsi > $@ 86 +
73 @cat main-begin-$(HOST_CPU).nsi >> $@ 87 @cat main-begin-$(HOST_CPU).nsi >> $@
74 88
75 # Install plugins 89 # Install plugins
@@ -80,20 +94,64 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \ @@ -80,20 +94,64 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
80 # Finalize 94 # Finalize
81 95
82 @cat main-end.nsi >> $@ 96 @cat main-end.nsi >> $@
83 - @cat runtime.nsi >> $@ 97 +
  98 +
  99 +.tmp/suffix-$(HOST_CPU).nsi: \
  100 + header-$(HOST_CPU).nsi \
  101 + main-begin-$(HOST_CPU).nsi \
  102 + main-end.nsi \
  103 + runtime.nsi \
  104 + sdk.nsi \
  105 + uninstall-$(HOST_CPU).nsi \
  106 + oninit-$(HOST_CPU).nsi \
  107 + $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) \
  108 + $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension-init.nsi ) \
  109 + $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi )
  110 +
  111 + @$(MKDIR) `dirname $@`
  112 +
  113 + @rm -f $@
  114 +
84 @cat sdk.nsi >> $@ 115 @cat sdk.nsi >> $@
85 @cat uninstall-$(HOST_CPU).nsi >> $@ 116 @cat uninstall-$(HOST_CPU).nsi >> $@
86 @cat oninit-$(HOST_CPU).nsi >> $@ 117 @cat oninit-$(HOST_CPU).nsi >> $@
87 118
88 - # Install plugin scripts 119 +$(PACKAGE_NAME)-$(HOST_CPU).nsi: \
  120 + .tmp/prefix-$(HOST_CPU).nsi \
  121 + .tmp/suffix-$(HOST_CPU).nsi \
  122 +
  123 + @cat header-$(HOST_CPU).nsi > $@
  124 + @cat .tmp/prefix-$(HOST_CPU).nsi >> $@
  125 + @cat runtime.nsi >> $@
  126 + @cat .tmp/suffix-$(HOST_CPU).nsi >> $@
89 127
90 @cat runtime-init.nsi >> $@ 128 @cat runtime-init.nsi >> $@
91 @cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) >> $@ 129 @cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) >> $@
  130 + @cat $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension-init.nsi ) >> $@
92 131
93 # Finalize onInit script 132 # Finalize onInit script
94 133
95 @echo FunctionEnd >> $@ 134 @echo FunctionEnd >> $@
96 135
  136 +
  137 + @chmod 644 $@
  138 +
  139 + @echo $@
  140 +
  141 +$(PACKAGE_NAME)-$(HOST_CPU)-no-gtk.nsi: \
  142 + .tmp/prefix-$(HOST_CPU).nsi \
  143 + .tmp/suffix-$(HOST_CPU).nsi \
  144 +
  145 + @cat header-$(HOST_CPU)-no-gtk.nsi > $@
  146 + @cat .tmp/prefix-$(HOST_CPU).nsi >> $@
  147 + @cat .tmp/suffix-$(HOST_CPU).nsi >> $@
  148 +
  149 + @cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) >> $@
  150 + @cat $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension-init.nsi ) >> $@
  151 +
  152 + # Finalize onInit script
  153 +
  154 + @echo FunctionEnd >> $@
97 @chmod 644 $@ 155 @chmod 644 $@
98 156
99 @echo $@ 157 @echo $@
nsi/java-extension-init.nsi 0 → 100644
  Diff comments   View file @368dc17
nsi/java-extension.nsi
  Diff comments   View file @368dc17
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
  1 + Section /o "Java" JNIModule
  2 +
  3 + setOutPath $INSTDIR
  4 + file "/oname=$SYSDIR\jni3270.dll" "..\.bin\Release\jni3270.dll"
  5 + file "/oname=$INSTDIR\plugins\j3270.dll" "..\.bin\Release\plugins\j3270.dll"
  6 +
  7 + sectionEnd
  8 +
nsi/python-extension-init.nsi 0 → 100644
  Diff comments   View file @368dc17
nsi/python-extension.nsi
  Diff comments   View file @368dc17
1 Section /o "Python" PythonModule 1 Section /o "Python" PythonModule
2 2
3 setOutPath $INSTDIR 3 setOutPath $INSTDIR
4 - file "/oname=$SYSDIR\py3270.dll" "..\.bin\Release\py3270.dll" 4 + file "/oname=$INSTDIR\py3270.pyd" "..\.bin\Release\py3270.dll"
5 5
6 sectionEnd 6 sectionEnd
7 7
nsi/rexx-extension-init.nsi 0 → 100644
  Diff comments   View file @368dc17
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2015-11-03 10:19-0200\n" 8 +"POT-Creation-Date: 2015-11-03 15:43-0200\n"
9 "PO-Revision-Date: 2014-02-17 08:05-0300\n" 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Portugues <>\n" 11 "Language-Team: Portugues <>\n"
@@ -28,7 +28,7 @@ failed() @@ -28,7 +28,7 @@ failed()
28 CopyPacket() 28 CopyPacket()
29 { 29 {
30 30
31 - FILENAME=$(find . -maxdepth 1 -name "*.exe" | head --lines 1 | sed "s@./@@g") 31 + FILENAME=$(find nsi -maxdepth 1 -name "*.exe" | head --lines 1 | sed "s@./@@g")
32 32
33 mkdir -p ${DESTDIR}/${1} 33 mkdir -p ${DESTDIR}/${1}
34 34
@@ -76,9 +76,8 @@ build() @@ -76,9 +76,8 @@ build()
76 ./configure \ 76 ./configure \
77 --cache-file=${1}.cache \ 77 --cache-file=${1}.cache \
78 --host=${host} \ 78 --host=${host} \
79 - --prefix=${prefix} \  
80 - --disable-java  
81 - 79 + --prefix=${prefix}
  80 +
82 if [ "$?" != "0" ]; then 81 if [ "$?" != "0" ]; then
83 failed "Erro ao configurar" 82 failed "Erro ao configurar"
84 fi 83 fi
@@ -108,12 +107,12 @@ build() @@ -108,12 +107,12 @@ build()
108 fi 107 fi
109 108
110 echo -e "\e]2;pw3270-install-${host_cpu}.exe\a" 109 echo -e "\e]2;pw3270-install-${host_cpu}.exe\a"
111 - cat nsi/pw3270-${host_cpu}.nsi | makensis \  
112 - -DLOCALEDIR=".bin/Release${prefix}/share/locale" \  
113 - -  
114 -  
115 -# -Onsis-${host_cpu}.log - 110 + make -C nsi package
  111 + if [ "$?" != "0" ]; then
  112 + failed "Erro ao gerar pacote windows"
  113 + fi
116 114
  115 + make -C nsi package-no-gtk
117 if [ "$?" != "0" ]; then 116 if [ "$?" != "0" ]; then
118 failed "Erro ao gerar pacote windows" 117 failed "Erro ao gerar pacote windows"
119 fi 118 fi