diff --git a/configure.ac b/configure.ac index 91bfcab..c765d02 100644 --- a/configure.ac +++ b/configure.ac @@ -75,6 +75,13 @@ if test $GZIP = "no" ; then fi AC_SUBST(GZIP) +AC_CHECK_PROGS(ZIP,[zip],no) +export ZIP; +if test $GZIP = "no" ; then + AC_MSG_ERROR([Unable to find the gzip application]); +fi +AC_SUBST(ZIP) + AC_CHECK_PROGS(CONVERT,[rsvg-convert],no) AC_SUBST(CONVERT) @@ -433,6 +440,8 @@ AC_CONFIG_FILES([ src/lib3270/mkversion.sh src/pw3270/Makefile src/oxt/Makefile + src/oxt/description.xml + src/oxt/manifest.xml src/pw3270/uiparser/Makefile src/tools/Makefile src/plugins/hllapi/Makefile diff --git a/po/pt_BR.po b/po/pt_BR.po index 67c4efa..25cee39 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-14 14:10-0300\n" +"POT-Creation-Date: 2013-03-15 10:08-0300\n" "PO-Revision-Date: 2013-03-12 11:29-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" diff --git a/src/oxt/Makefile.in b/src/oxt/Makefile.in index 8bd59a2..bfc316e 100644 --- a/src/oxt/Makefile.in +++ b/src/oxt/Makefile.in @@ -22,6 +22,8 @@ OBJRLS = $(OBJDIR)/Release #---[ Tools ]------------------------------------------------------------------------------------------ MKDIR=@MKDIR_P@ CXX=@CXX@ +CONVERT=@CONVERT@ +ZIP=@ZIP@ DBG_CFLAGS=-g -DDEBUG=1 RLS_CFLAGS=-DNDEBUG=1 @@ -62,12 +64,16 @@ LDFLAGS=-L${OO_SDK_HOME}/lib -L${OO_SDK_URE_HOME}/lib -Wl,-rpath-link=${OO_SDK_U # CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) -DGXX_INCLUDE_PATH=$(SDK_GXX_INCLUDE_PATH) -DHAVE_GCC_VISIBILITY_FEATURE - $(OBJDBG)/%.o: %.cxx $(OBJDIR)/uno/include/br/com/bb/$(PACKAGE).hpp Makefile @echo $< ... @$(MKDIR) `dirname $@` @$(CXX) $(DBG_CFLAGS) $(CXXFLAGS) $(LIB3270_CFLAGS) $(DLL_CFLAGS) -o $@ -c $< +$(OBJRLS)/%.o: %.cxx $(OBJDIR)/uno/include/br/com/bb/$(PACKAGE).hpp Makefile + @echo $< ... + @$(MKDIR) `dirname $@` + @$(CXX) $(CXXFLAGS) $(LIB3270_CFLAGS) $(DLL_CFLAGS) -o $@ -c $< + %.urd: %.idl @echo $< ... @$(MKDIR) `dirname $@` @@ -81,7 +87,35 @@ $(OBJDBG)/%.o: %.cxx $(OBJDIR)/uno/include/br/com/bb/$(PACKAGE).hpp Makefile $(REGMERGE) -v $@ /UCR $< $(REGMERGE) -v $@ / $< -#---[ Targets ]---------------------------------------------------------------------------------------- + +#---[ Release targets ]-------------------------------------------------------------------------------- + +Release: $(PACKAGE).oxt + +$(PACKAGE).oxt: $(BINRLS)/$(PACKAGE).uno@DLLEXT@ $(PACKAGE).uno.rdb description.xml manifest.xml description.txt + @$(MKDIR) $(BINDIR)/$(PACKAGE).oxt + + @$(MKDIR) $(BINDIR)/$(PACKAGE).oxt/META-INF + @cp description.xml $(BINDIR)/$(PACKAGE).oxt/META-INF + @cp manifest.xml $(BINDIR)/$(PACKAGE).oxt/META-INF + + @cp description.txt $(BINDIR)/$(PACKAGE).oxt + @$(CONVERT) ../pw3270/pixmaps/pw3270.svg --format=png > $(BINDIR)/$(PACKAGE).oxt/$(PACKAGE).png + + @$(MKDIR) $(BINDIR)/$(PACKAGE).oxt/linux + @cp $(BINRLS)/$(PACKAGE).uno@DLLEXT@ $(BINDIR)/$(PACKAGE).oxt/linux + @cp $(PACKAGE).uno.rdb $(BINDIR)/$(PACKAGE).oxt + @rm -f $(BINDIR)/$(PACKAGE).zip + @cd $(BINDIR)/$(PACKAGE).oxt ; $(ZIP) -r ../$(PACKAGE).zip . + @mv $(BINDIR)/$(PACKAGE).zip $@ + @echo $@ Ok. + +$(BINRLS)/$(PACKAGE).uno@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) + @echo $@ ... + @$(MKDIR) `dirname $@` + @$(CXX) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ + +#---[ Debug Targets ]---------------------------------------------------------------------------------- Debug: $(BINDBG)/testprogram @@ -90,12 +124,12 @@ run: $(BINDBG)/testprogram $(BINDBG)/$(PACKAGE).uno@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) @echo $@ ... - @$(MKDIR) -p `dirname $@` + @$(MKDIR) `dirname $@` @$(CXX) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(BINDBG)/testprogram: $(BINDBG)/$(PACKAGE).uno@DLLEXT@ $(OBJDBG)/testprogram.o @echo $@ ... - @$(MKDIR) -p `dirname $@` + @$(MKDIR) `dirname $@` @$(CXX) $(LDFLAGS) -o $@ $(OBJDBG)/testprogram.o $(OBJDIR)/uno/include/br/com/bb/$(PACKAGE).hpp: $(PACKAGE).uno.rdb diff --git a/src/oxt/description.txt b/src/oxt/description.txt new file mode 100644 index 0000000..a163cab --- /dev/null +++ b/src/oxt/description.txt @@ -0,0 +1,2 @@ +Uno/OpenOffice library allowing 3270 access from StarBasic + diff --git a/src/oxt/description.xml.in b/src/oxt/description.xml.in new file mode 100644 index 0000000..3d1de59 --- /dev/null +++ b/src/oxt/description.xml.in @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 3270 access extension + + + + + + + + + + + + + diff --git a/src/oxt/manifest.xml.in b/src/oxt/manifest.xml.in new file mode 100644 index 0000000..28c639f --- /dev/null +++ b/src/oxt/manifest.xml.in @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/oxt/pw3270OXT.cbp b/src/oxt/pw3270OXT.cbp index d84b7ac..44d32a5 100644 --- a/src/oxt/pw3270OXT.cbp +++ b/src/oxt/pw3270OXT.cbp @@ -35,10 +35,12 @@ + + -- libgit2 0.21.2