Download as
Browse Code »

Commit 83a98962d6b41325b9955d0aabe60e8f19537611

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

Atualizando empacotamento

Showing 3 changed files with 59 additions and 12 deletions   Show diff stats
@@ -150,10 +150,10 @@ $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DL @@ -150,10 +150,10 @@ $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DL
150 $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile 150 $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
151 @$(MAKE) BINRLS=../../.bin/Release@DLLDIR@ -C src/lib3270 ../../.bin/Release@DLLDIR@/lib3270@DLLEXT@ 151 @$(MAKE) BINRLS=../../.bin/Release@DLLDIR@ -C src/lib3270 ../../.bin/Release@DLLDIR@/lib3270@DLLEXT@
152 152
153 -oxt: $(BINDIR)/$(PACKAGE_TARNAME).oxt 153 +oxt: $(BINDIR)/$(PACKAGE_NAME).oxt
154 154
155 -$(BINDIR)/$(PACKAGE_TARNAME).oxt: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)  
156 - @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt ../../.bin/$(PACKAGE_TARNAME).oxt 155 +$(BINDIR)/$(PACKAGE_NAME).oxt: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  156 + @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/loffice ../../.bin/$(PACKAGE_NAME).oxt
157 157
158 #---[ Debug targets ]---------------------------------------------------------- 158 #---[ Debug targets ]----------------------------------------------------------
159 159
@@ -576,9 +576,9 @@ AC_CONFIG_FILES([ @@ -576,9 +576,9 @@ AC_CONFIG_FILES([
576 src/lib3270/Makefile 576 src/lib3270/Makefile
577 src/lib3270/mkversion.sh 577 src/lib3270/mkversion.sh
578 src/pw3270/Makefile 578 src/pw3270/Makefile
579 - src/openoffice/Makefile  
580 - src/openoffice/description.xml  
581 - src/openoffice/manifest.xml 579 + src/loffice/Makefile
  580 + src/loffice/description.xml
  581 + src/loffice/manifest.xml
582 src/pw3270/uiparser/Makefile 582 src/pw3270/uiparser/Makefile
583 src/tools/Makefile 583 src/tools/Makefile
584 src/plugins/hllapi/Makefile 584 src/plugins/hllapi/Makefile
src/loffice/Makefile.in
  Diff comments   View file @83a9896
@@ -63,10 +63,10 @@ MKDIR=@MKDIR_P@ @@ -63,10 +63,10 @@ MKDIR=@MKDIR_P@
63 63
64 #---[ Paths ]------------------------------------------------------------------ 64 #---[ Paths ]------------------------------------------------------------------
65 65
66 -OBJDIR=.obj  
67 -BINDIR=.bin  
68 -RDBDIR=.rdb  
69 -URDDIR=.urd 66 +OBJDIR ?= .obj
  67 +BINDIR ?= .bin
  68 +RDBDIR ?= .rdb
  69 +URDDIR ?= .urd
70 70
71 OBJDBG=$(OBJDIR)/Debug 71 OBJDBG=$(OBJDIR)/Debug
72 BINDBG=$(BINDIR)/Debug 72 BINDBG=$(BINDIR)/Debug
@@ -84,7 +84,10 @@ include $(CLASSLIBDIR)/class.mak @@ -84,7 +84,10 @@ include $(CLASSLIBDIR)/class.mak
84 #---[ Build options ]---------------------------------------------------------- 84 #---[ Build options ]----------------------------------------------------------
85 85
86 CPPUENV="gcc3" 86 CPPUENV="gcc3"
87 -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)\" 87 +
  88 +CXXFLAGS=@CXXFLAGS@ -fvisibility=hidden @DLL_CFLAGS@ -Wno-strict-aliasing \
  89 + -I../include -I./include -I$(includedir)/libreoffice \
  90 + -DCPPU_ENV=$(CPPUENV) -DLANGUAGE_BINDING_NAME=\"$(CPPUENV)\"
88 91
89 OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ 92 OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \
90 -Wl,-rpath-link=$(OO_SDK_URE_HOME)/lib,-rpath=$(OO_SDK_URE_HOME)/lib \ 93 -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 \ @@ -118,7 +121,13 @@ $(OBJDBG)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \
118 @echo " CC `basename $@`" 121 @echo " CC `basename $@`"
119 @mkdir -p `dirname $@` 122 @mkdir -p `dirname $@`
120 @$(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $< 123 @$(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $<
121 -# $(DBG_CFLAGS) $(CXXFLAGS) $(LIB3270_CFLAGS) -DLIBNAME=\"$(BINDBG)/$(PROGRAM_NAME).uno@DLLEXT@\" -o $@ -c $< 124 +
  125 +$(OBJRLS)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \
  126 + $(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \
  127 + *.hpp Makefile
  128 + @echo " CC `basename $@`"
  129 + @mkdir -p `dirname $@`
  130 + @$(CXX) -DNDEBUG=1 $(CXXFLAGS) -o $@ -c $<
122 131
123 #---[ UNO targets ]------------------------------------------------------------ 132 #---[ UNO targets ]------------------------------------------------------------
124 133
@@ -127,6 +136,44 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb @@ -127,6 +136,44 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb
127 @$(MKDIR) `dirname $@` 136 @$(MKDIR) `dirname $@`
128 @$(CPPUMAKER) -O./include -T$(PACKAGE_NAME).lib3270 $(TYPES_RDB) $< 137 @$(CPPUMAKER) -O./include -T$(PACKAGE_NAME).lib3270 $(TYPES_RDB) $<
129 138
  139 +#---[ Release targets ]--------------------------------------------------------
  140 +
  141 +Release: $(BINDIR)/$(PACKAGE_NAME).oxt
  142 +
  143 +$(BINDIR)/$(PACKAGE_NAME).oxt: \
  144 + $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \
  145 + $(RDBDIR)/$(PACKAGE_NAME).rdb \
  146 + description.xml \
  147 + manifest.xml \
  148 + description.txt
  149 + @rm -f $@
  150 + @$(MKDIR) `dirname $@`
  151 +
  152 + @$(MKDIR) $(BINRLS)/$(PACKAGE).oxt.tmp
  153 +
  154 + @cp $(RDBDIR)/$(PACKAGE_NAME).rdb $(BINDBG)/$(PACKAGE).oxt.tmp
  155 + @cp $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINRLS)/$(PACKAGE).oxt.tmp
  156 +
  157 + @$(MKDIR) $(BINDBG)/$(PACKAGE).oxt.tmp/META-INF
  158 + @cp manifest.xml $(BINRLS)/$(PACKAGE).oxt.tmp/META-INF
  159 +
  160 + @cp description.xml $(BINRLS)/$(PACKAGE).oxt.tmp
  161 + @cp description.txt $(BINRLS)/$(PACKAGE).oxt.tmp
  162 +
  163 + @$(CONVERT) ../$(PACKAGE_NAME)/pixmaps/$(PACKAGE_NAME).svg --format=png > $(BINRLS)/$(PACKAGE).oxt.tmp/$(PACKAGE_NAME).png
  164 +
  165 + @cp $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINRLS)/$(PACKAGE_NAME).oxt.tmp
  166 + @cd $(BINDBG)/$(PACKAGE).oxt.tmp ; $(ZIP) -r -m ../$(PACKAGE_NAME).oxt .
  167 + @rm -fr $(BINRLS)/$(PACKAGE).oxt.tmp
  168 + @echo $@ Ok.
  169 +
  170 +$(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@: \
  171 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) \
  172 + $(CLASS_RELEASE_OBJECTS)
  173 + @echo " LD `basename $@`"
  174 + @$(MKDIR) `dirname $@`
  175 + $(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^
  176 +
130 177
131 #---[ Debug targets ]---------------------------------------------------------- 178 #---[ Debug targets ]----------------------------------------------------------
132 179