diff --git a/configure.ac b/configure.ac
index 264a7af..7471104 100644
--- a/configure.ac
+++ b/configure.ac
@@ -577,6 +577,8 @@ AC_CONFIG_FILES([
src/lib3270/mkversion.sh
src/pw3270/Makefile
src/openoffice/Makefile
+ src/openoffice/description.xml
+ src/openoffice/manifest.xml
src/pw3270/uiparser/Makefile
src/tools/Makefile
src/plugins/hllapi/Makefile
diff --git a/src/openoffice/Makefile.in b/src/openoffice/Makefile.in
index 3bd59f2..809d36a 100644
--- a/src/openoffice/Makefile.in
+++ b/src/openoffice/Makefile.in
@@ -24,6 +24,7 @@
# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
#
+PACKAGE_NAME=@PACKAGE_NAME@
SOURCES=info.cc get.cc service.cc init.cc
UNO_CLASSES=XWeak RuntimeException
@@ -34,9 +35,13 @@ OO_SDK_HOME=@OO_SDK_HOME@
OO_SDK_URE_HOME=@OO_SDK_URE_HOME@
UNO=@UNO@
+UNOPKG=@UNOPKG@
IDLC=@IDLC@
REGMERGE=@REGMERGE@
CPPUMAKER=@CPPUMAKER@
+CONVERT=@CONVERT@
+ZIP=@ZIP@
+
TYPES_RDB=@OO_SDK_URE_HOME@/share/misc/types.rdb
#---[ Paths ]------------------------------------------------------------------
@@ -103,7 +108,7 @@ include/%.hpp: $(RDBDIR)/%.rdb
@$(MKDIR) `dirname $@`
@$(CPPUMAKER) -O./include $(TYPES_RDB) $<
-$(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \
+$(OBJDBG)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \
$(foreach CLS, $(basename $(UNO_CLASSES)), include/com/sun/star/uno/$(CLS).hpp) \
*.hpp Makefile
@echo " CC `basename $@`"
@@ -113,28 +118,57 @@ $(OBJDBG)/%.o: %.cc include/pw3270/lib3270.hpp \
#---[ UNO targets ]------------------------------------------------------------
-include/pw3270/lib3270.hpp: $(RDBDIR)/pw3270.rdb
+include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb
@echo " CPPU `basename $@`"
@$(MKDIR) `dirname $@`
- @$(CPPUMAKER) -O./include -Tpw3270.lib3270 $(TYPES_RDB) $<
+ @$(CPPUMAKER) -O./include -T$(PACKAGE_NAME).lib3270 $(TYPES_RDB) $<
#---[ Debug targets ]----------------------------------------------------------
-Debug: $(BINDBG)/pw3270.uno@DLLEXT@
+Debug: $(BINDBG)/$(PACKAGE_NAME).oxt
$(BINDBG)/testprogram: $(OBJDBG)/testprogram@OBJEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
@echo $@ ...
@$(MKDIR) `dirname $@`
- $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) -o $(BINDBG)/pw3270.uno@DLLEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
+ $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) -o $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
-$(BINDBG)/pw3270.uno@DLLEXT@: \
+$(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@: \
$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) \
$(CLASS_DEBUG_OBJECTS)
@echo " LD `basename $@`"
@$(MKDIR) `dirname $@`
$(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^
+
+$(BINDBG)/$(PACKAGE_NAME).oxt: \
+ $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ \
+ $(PACKAGE_NAME).rdb \
+ description.xml \
+ manifest.xml \
+ description.txt
+ @rm -f $@
+ @$(MKDIR) `dirname $@`
+
+ @$(MKDIR) $(BINDBG)/$(PACKAGE).oxt.tmp
+
+ @cp $(PACKAGE_NAME).rdb $(BINDBG)/$(PACKAGE).oxt.tmp
+ @cp $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINDBG)/$(PACKAGE).oxt.tmp
+
+ @$(MKDIR) $(BINDBG)/$(PACKAGE).oxt.tmp/META-INF
+ @cp manifest.xml $(BINDBG)/$(PACKAGE).oxt.tmp/META-INF
+
+ @cp description.xml $(BINDBG)/$(PACKAGE).oxt.tmp
+ @cp description.txt $(BINDBG)/$(PACKAGE).oxt.tmp
+
+ @$(CONVERT) ../$(PACKAGE_NAME)/pixmaps/$(PACKAGE_NAME).svg --format=png > $(BINDBG)/$(PACKAGE).oxt.tmp/$(PACKAGE_NAME).png
+
+ @cp $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINDBG)/$(PACKAGE_NAME).oxt.tmp
+ @cp $(PACKAGE_NAME).rdb $(BINDBG)/$(PACKAGE_NAME).oxt.tmp
+ cd $(BINDBG)/$(PACKAGE).oxt.tmp ; $(ZIP) -r -m ../$(PACKAGE_NAME).oxt .
+ @echo $@ Ok.
+
+
#---[ Misc targets ]-----------------------------------------------------------
cleanDebug: clean
diff --git a/src/openoffice/description.txt b/src/openoffice/description.txt
new file mode 100644
index 0000000..a163cab
--- /dev/null
+++ b/src/openoffice/description.txt
@@ -0,0 +1,2 @@
+Uno/OpenOffice library allowing 3270 access from StarBasic
+
diff --git a/src/openoffice/description.xml.in b/src/openoffice/description.xml.in
new file mode 100644
index 0000000..3d1de59
--- /dev/null
+++ b/src/openoffice/description.xml.in
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3270 access extension
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/openoffice/get.cc b/src/openoffice/get.cc
index 297a3d5..c8d2a56 100644
--- a/src/openoffice/get.cc
+++ b/src/openoffice/get.cc
@@ -25,33 +25,6 @@
* perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
* erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
*
- /*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA, 02111-1307, USA
- *
- * Este programa está nomeado como info.cc e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
- *
* Referência:
*
* https://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/C%2B%2B/Class_Definition_with_Helper_Template_Classes
diff --git a/src/openoffice/loffice3270.cbp b/src/openoffice/loffice3270.cbp
index 2916fd6..db6c3b3 100644
--- a/src/openoffice/loffice3270.cbp
+++ b/src/openoffice/loffice3270.cbp
@@ -46,6 +46,7 @@
+
diff --git a/src/openoffice/manifest.xml.in b/src/openoffice/manifest.xml.in
new file mode 100644
index 0000000..1b57453
--- /dev/null
+++ b/src/openoffice/manifest.xml.in
@@ -0,0 +1,6 @@
+
+
+
+
+
+
--
libgit2 0.21.2