From 83a98962d6b41325b9955d0aabe60e8f19537611 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Tue, 1 Apr 2014 13:17:06 +0000 Subject: [PATCH] Atualizando empacotamento --- Makefile.in | 6 +++--- configure.ac | 6 +++--- src/loffice/Makefile.in | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 59 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index 61d4dff..8ea9373 100644 --- a/Makefile.in +++ b/Makefile.in @@ -150,10 +150,10 @@ $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DL $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile @$(MAKE) BINRLS=../../.bin/Release@DLLDIR@ -C src/lib3270 ../../.bin/Release@DLLDIR@/lib3270@DLLEXT@ -oxt: $(BINDIR)/$(PACKAGE_TARNAME).oxt +oxt: $(BINDIR)/$(PACKAGE_NAME).oxt -$(BINDIR)/$(PACKAGE_TARNAME).oxt: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) - @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt ../../.bin/$(PACKAGE_TARNAME).oxt +$(BINDIR)/$(PACKAGE_NAME).oxt: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) + @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/loffice ../../.bin/$(PACKAGE_NAME).oxt #---[ Debug targets ]---------------------------------------------------------- diff --git a/configure.ac b/configure.ac index ab15284..7e50f0c 100644 --- a/configure.ac +++ b/configure.ac @@ -576,9 +576,9 @@ AC_CONFIG_FILES([ src/lib3270/Makefile src/lib3270/mkversion.sh src/pw3270/Makefile - src/openoffice/Makefile - src/openoffice/description.xml - src/openoffice/manifest.xml + src/loffice/Makefile + src/loffice/description.xml + src/loffice/manifest.xml src/pw3270/uiparser/Makefile src/tools/Makefile src/plugins/hllapi/Makefile diff --git a/src/loffice/Makefile.in b/src/loffice/Makefile.in index 4d95ccf..9d8552f 100644 --- a/src/loffice/Makefile.in +++ b/src/loffice/Makefile.in @@ -63,10 +63,10 @@ MKDIR=@MKDIR_P@ #---[ Paths ]------------------------------------------------------------------ -OBJDIR=.obj -BINDIR=.bin -RDBDIR=.rdb -URDDIR=.urd +OBJDIR ?= .obj +BINDIR ?= .bin +RDBDIR ?= .rdb +URDDIR ?= .urd OBJDBG=$(OBJDIR)/Debug BINDBG=$(BINDIR)/Debug @@ -84,7 +84,10 @@ include $(CLASSLIBDIR)/class.mak #---[ Build options ]---------------------------------------------------------- CPPUENV="gcc3" -CXXFLAGS=@CXXFLAGS@ -fvisibility=hidden @DLL_CFLAGS@ -Wno-strict-aliasing -I../include -I./include -I$(includedir)/libreoffice -Wno-strict-aliasing -DCPPU_ENV=$(CPPUENV) -DLANGUAGE_BINDING_NAME=\"$(CPPUENV)\" + +CXXFLAGS=@CXXFLAGS@ -fvisibility=hidden @DLL_CFLAGS@ -Wno-strict-aliasing \ + -I../include -I./include -I$(includedir)/libreoffice \ + -DCPPU_ENV=$(CPPUENV) -DLANGUAGE_BINDING_NAME=\"$(CPPUENV)\" OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ -Wl,-rpath-link=$(OO_SDK_URE_HOME)/lib,-rpath=$(OO_SDK_URE_HOME)/lib \ @@ -118,7 +121,13 @@ $(OBJDBG)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \ @echo " CC `basename $@`" @mkdir -p `dirname $@` @$(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $< -# $(DBG_CFLAGS) $(CXXFLAGS) $(LIB3270_CFLAGS) -DLIBNAME=\"$(BINDBG)/$(PROGRAM_NAME).uno@DLLEXT@\" -o $@ -c $< + +$(OBJRLS)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \ + $(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \ + *.hpp Makefile + @echo " CC `basename $@`" + @mkdir -p `dirname $@` + @$(CXX) -DNDEBUG=1 $(CXXFLAGS) -o $@ -c $< #---[ UNO targets ]------------------------------------------------------------ @@ -127,6 +136,44 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb @$(MKDIR) `dirname $@` @$(CPPUMAKER) -O./include -T$(PACKAGE_NAME).lib3270 $(TYPES_RDB) $< +#---[ Release targets ]-------------------------------------------------------- + +Release: $(BINDIR)/$(PACKAGE_NAME).oxt + +$(BINDIR)/$(PACKAGE_NAME).oxt: \ + $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \ + $(RDBDIR)/$(PACKAGE_NAME).rdb \ + description.xml \ + manifest.xml \ + description.txt + @rm -f $@ + @$(MKDIR) `dirname $@` + + @$(MKDIR) $(BINRLS)/$(PACKAGE).oxt.tmp + + @cp $(RDBDIR)/$(PACKAGE_NAME).rdb $(BINDBG)/$(PACKAGE).oxt.tmp + @cp $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINRLS)/$(PACKAGE).oxt.tmp + + @$(MKDIR) $(BINDBG)/$(PACKAGE).oxt.tmp/META-INF + @cp manifest.xml $(BINRLS)/$(PACKAGE).oxt.tmp/META-INF + + @cp description.xml $(BINRLS)/$(PACKAGE).oxt.tmp + @cp description.txt $(BINRLS)/$(PACKAGE).oxt.tmp + + @$(CONVERT) ../$(PACKAGE_NAME)/pixmaps/$(PACKAGE_NAME).svg --format=png > $(BINRLS)/$(PACKAGE).oxt.tmp/$(PACKAGE_NAME).png + + @cp $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINRLS)/$(PACKAGE_NAME).oxt.tmp + @cd $(BINDBG)/$(PACKAGE).oxt.tmp ; $(ZIP) -r -m ../$(PACKAGE_NAME).oxt . + @rm -fr $(BINRLS)/$(PACKAGE).oxt.tmp + @echo $@ Ok. + +$(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@: \ + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \ + $(CLASS_RELEASE_OBJECTS) + @echo " LD `basename $@`" + @$(MKDIR) `dirname $@` + $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^ + #---[ Debug targets ]---------------------------------------------------------- -- libgit2 0.21.2