Download as
Browse Code »

Commit 07eec1f0acc707419557913f320c74aec21a51bd

Authored by perry.werneck@gmail.com
1 parent a9be51dd
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Empacotando oxt de debug

Showing 7 changed files with 81 additions and 33 deletions   Show diff stats
@@ -577,6 +577,8 @@ AC_CONFIG_FILES([ @@ -577,6 +577,8 @@ AC_CONFIG_FILES([
577 src/lib3270/mkversion.sh 577 src/lib3270/mkversion.sh
578 src/pw3270/Makefile 578 src/pw3270/Makefile
579 src/openoffice/Makefile 579 src/openoffice/Makefile
  580 + src/openoffice/description.xml
  581 + src/openoffice/manifest.xml
580 src/pw3270/uiparser/Makefile 582 src/pw3270/uiparser/Makefile
581 src/tools/Makefile 583 src/tools/Makefile
582 src/plugins/hllapi/Makefile 584 src/plugins/hllapi/Makefile
src/openoffice/Makefile.in
  Diff comments   View file @07eec1f
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) 24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
25 # 25 #
26 26
  27 +PACKAGE_NAME=@PACKAGE_NAME@
27 SOURCES=info.cc get.cc service.cc init.cc 28 SOURCES=info.cc get.cc service.cc init.cc
28 29
29 UNO_CLASSES=XWeak RuntimeException 30 UNO_CLASSES=XWeak RuntimeException
@@ -34,9 +35,13 @@ OO_SDK_HOME=@OO_SDK_HOME@ @@ -34,9 +35,13 @@ OO_SDK_HOME=@OO_SDK_HOME@
34 OO_SDK_URE_HOME=@OO_SDK_URE_HOME@ 35 OO_SDK_URE_HOME=@OO_SDK_URE_HOME@
35 36
36 UNO=@UNO@ 37 UNO=@UNO@
  38 +UNOPKG=@UNOPKG@
37 IDLC=@IDLC@ 39 IDLC=@IDLC@
38 REGMERGE=@REGMERGE@ 40 REGMERGE=@REGMERGE@
39 CPPUMAKER=@CPPUMAKER@ 41 CPPUMAKER=@CPPUMAKER@
  42 +CONVERT=@CONVERT@
  43 +ZIP=@ZIP@
  44 +
40 TYPES_RDB=@OO_SDK_URE_HOME@/share/misc/types.rdb 45 TYPES_RDB=@OO_SDK_URE_HOME@/share/misc/types.rdb
41 46
42 #---[ Paths ]------------------------------------------------------------------ 47 #---[ Paths ]------------------------------------------------------------------
@@ -103,7 +108,7 @@ include/%.hpp: $(RDBDIR)/%.rdb @@ -103,7 +108,7 @@ include/%.hpp: $(RDBDIR)/%.rdb
103 @$(MKDIR) `dirname $@` 108 @$(MKDIR) `dirname $@`
104 @$(CPPUMAKER) -O./include $(TYPES_RDB) $< 109 @$(CPPUMAKER) -O./include $(TYPES_RDB) $<
105 110
106 -$(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \ 111 +$(OBJDBG)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \
107 $(foreach CLS, $(basename $(UNO_CLASSES)), include/com/sun/star/uno/$(CLS).hpp) \ 112 $(foreach CLS, $(basename $(UNO_CLASSES)), include/com/sun/star/uno/$(CLS).hpp) \
108 *.hpp Makefile 113 *.hpp Makefile
109 @echo " CC `basename $@`" 114 @echo " CC `basename $@`"
@@ -113,28 +118,57 @@ $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \ @@ -113,28 +118,57 @@ $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \
113 118
114 #---[ UNO targets ]------------------------------------------------------------ 119 #---[ UNO targets ]------------------------------------------------------------
115 120
116 -include/pw3270/lib3270.hpp: $(RDBDIR)/pw3270.rdb 121 +include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb
117 @echo " CPPU `basename $@`" 122 @echo " CPPU `basename $@`"
118 @$(MKDIR) `dirname $@` 123 @$(MKDIR) `dirname $@`
119 - @$(CPPUMAKER) -O./include -Tpw3270.lib3270 $(TYPES_RDB) $< 124 + @$(CPPUMAKER) -O./include -T$(PACKAGE_NAME).lib3270 $(TYPES_RDB) $<
120 125
121 126
122 #---[ Debug targets ]---------------------------------------------------------- 127 #---[ Debug targets ]----------------------------------------------------------
123 128
124 -Debug: $(BINDBG)/pw3270.uno@DLLEXT@ 129 +Debug: $(BINDBG)/$(PACKAGE_NAME).oxt
125 130
126 $(BINDBG)/testprogram: $(OBJDBG)/testprogram@OBJEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) 131 $(BINDBG)/testprogram: $(OBJDBG)/testprogram@OBJEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
127 @echo $@ ... 132 @echo $@ ...
128 @$(MKDIR) `dirname $@` 133 @$(MKDIR) `dirname $@`
129 - $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) -o $(BINDBG)/pw3270.uno@DLLEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) 134 + $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) -o $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
130 135
131 -$(BINDBG)/pw3270.uno@DLLEXT@: \ 136 +$(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@: \
132 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) \ 137 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) \
133 $(CLASS_DEBUG_OBJECTS) 138 $(CLASS_DEBUG_OBJECTS)
134 @echo " LD `basename $@`" 139 @echo " LD `basename $@`"
135 @$(MKDIR) `dirname $@` 140 @$(MKDIR) `dirname $@`
136 $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ 141 $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^
137 142
  143 +
  144 +$(BINDBG)/$(PACKAGE_NAME).oxt: \
  145 + $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ \
  146 + $(PACKAGE_NAME).rdb \
  147 + description.xml \
  148 + manifest.xml \
  149 + description.txt
  150 + @rm -f $@
  151 + @$(MKDIR) `dirname $@`
  152 +
  153 + @$(MKDIR) $(BINDBG)/$(PACKAGE).oxt.tmp
  154 +
  155 + @cp $(PACKAGE_NAME).rdb $(BINDBG)/$(PACKAGE).oxt.tmp
  156 + @cp $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINDBG)/$(PACKAGE).oxt.tmp
  157 +
  158 + @$(MKDIR) $(BINDBG)/$(PACKAGE).oxt.tmp/META-INF
  159 + @cp manifest.xml $(BINDBG)/$(PACKAGE).oxt.tmp/META-INF
  160 +
  161 + @cp description.xml $(BINDBG)/$(PACKAGE).oxt.tmp
  162 + @cp description.txt $(BINDBG)/$(PACKAGE).oxt.tmp
  163 +
  164 + @$(CONVERT) ../$(PACKAGE_NAME)/pixmaps/$(PACKAGE_NAME).svg --format=png > $(BINDBG)/$(PACKAGE).oxt.tmp/$(PACKAGE_NAME).png
  165 +
  166 + @cp $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINDBG)/$(PACKAGE_NAME).oxt.tmp
  167 + @cp $(PACKAGE_NAME).rdb $(BINDBG)/$(PACKAGE_NAME).oxt.tmp
  168 + cd $(BINDBG)/$(PACKAGE).oxt.tmp ; $(ZIP) -r -m ../$(PACKAGE_NAME).oxt .
  169 + @echo $@ Ok.
  170 +
  171 +
138 #---[ Misc targets ]----------------------------------------------------------- 172 #---[ Misc targets ]-----------------------------------------------------------
139 173
140 cleanDebug: clean 174 cleanDebug: clean
src/openoffice/description.txt 0 → 100644
  Diff comments   View file @07eec1f
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +Uno/OpenOffice library allowing 3270 access from StarBasic
  2 +
src/openoffice/description.xml.in 0 → 100644
  Diff comments   View file @07eec1f
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<description xmlns="http://openoffice.org/extensions/description/2006"
  3 +xmlns:d="http://openoffice.org/extensions/description/2006"
  4 +xmlns:xlink="http://www.w3.org/1999/xlink">
  5 +
  6 + <version value="@PACKAGE_VERSION@" />
  7 +
  8 + <identifier value="@PACKAGE_NAME@" />
  9 +
  10 + <platform value="linux_x86" />
  11 +
  12 + <dependencies>
  13 + <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
  14 + </dependencies>
  15 +
  16 + <display-name>
  17 + <name lang="en">3270 access extension</name>
  18 + </display-name>
  19 +
  20 + <icon>
  21 + <default xlink:href="@PACKAGE_NAME@.png" />
  22 + </icon>
  23 +
  24 + <extension-description>
  25 + <src xlink:href="description.txt" lang="en" />
  26 + </extension-description>
  27 +
  28 +
  29 +
  30 +</description>
src/openoffice/get.cc
  Diff comments   View file @07eec1f
@@ -25,33 +25,6 @@ @@ -25,33 +25,6 @@
25 * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) 25 * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
26 * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) 26 * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
27 * 27 *
28 - /*  
29 - * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270  
30 - * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a  
31 - * aplicativos mainframe. Registro no INPI sob o nome G3270.  
32 - *  
33 - * Copyright (C) <2008> <Banco do Brasil S.A.>  
34 - *  
35 - * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob  
36 - * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela  
37 - * Free Software Foundation.  
38 - *  
39 - * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER  
40 - * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO  
41 - * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para  
42 - * obter mais detalhes.  
43 - *  
44 - * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este  
45 - * programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple  
46 - * Place, Suite 330, Boston, MA, 02111-1307, USA  
47 - *  
48 - * Este programa está nomeado como info.cc e possui - linhas de código.  
49 - *  
50 - * Contatos:  
51 - *  
52 - * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)  
53 - * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)  
54 - *  
55 * Referência: 28 * Referência:
56 * 29 *
57 * https://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/C%2B%2B/Class_Definition_with_Helper_Template_Classes 30 * https://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/C%2B%2B/Class_Definition_with_Helper_Template_Classes
src/openoffice/loffice3270.cbp
  Diff comments   View file @07eec1f
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
46 <Unit filename="include/pw3270/lib3270.hpp" /> 46 <Unit filename="include/pw3270/lib3270.hpp" />
47 <Unit filename="info.cc" /> 47 <Unit filename="info.cc" />
48 <Unit filename="init.cc" /> 48 <Unit filename="init.cc" />
  49 + <Unit filename="manifest.xml.in" />
49 <Unit filename="pw3270.idl" /> 50 <Unit filename="pw3270.idl" />
50 <Unit filename="service.cc" /> 51 <Unit filename="service.cc" />
51 <Unit filename="testprogram.cc" /> 52 <Unit filename="testprogram.cc" />
src/openoffice/manifest.xml.in 0 → 100644
  Diff comments   View file @07eec1f
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<manifest:manifest>
  3 +<manifest:file-entry manifest:media-type= "application/vnd.sun.star.uno-component;type=native;platform=Linux_x86" manifest:full-path="@PACKAGE_NAME@.uno.so"/>
  4 +<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB" manifest:full-path="@PACKAGE_NAME@.rdb"/>
  5 +</manifest:manifest>
  6 +