Download as
Browse Code »

Commit b3d98206e389cba2dc1a536f9dd33b7e2912d813

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

Ajustes para empacotamento

Showing 10 changed files with 74 additions and 22 deletions   Show diff stats
@@ -154,6 +154,7 @@ oxt: $(BINDIR)/Release/$(PACKAGE_NAME).oxt @@ -154,6 +154,7 @@ oxt: $(BINDIR)/Release/$(PACKAGE_NAME).oxt
154 154
155 $(BINDIR)/Release/$(PACKAGE_NAME).oxt: 155 $(BINDIR)/Release/$(PACKAGE_NAME).oxt:
156 @$(MAKE) -C src/loffice Release 156 @$(MAKE) -C src/loffice Release
  157 + @$(MKDIR) `dirname $@`
157 @cp src/loffice/.bin/Release/$(PACKAGE_NAME).oxt $@ 158 @cp src/loffice/.bin/Release/$(PACKAGE_NAME).oxt $@
158 159
159 #---[ Debug targets ]---------------------------------------------------------- 160 #---[ Debug targets ]----------------------------------------------------------
@@ -238,6 +238,7 @@ CC="$ac_save_cc"]) @@ -238,6 +238,7 @@ CC="$ac_save_cc"])
238 AC_MSG_RESULT($app_cv_fvisibility_ok) 238 AC_MSG_RESULT($app_cv_fvisibility_ok)
239 if test $app_cv_fvisibility_ok = yes; then 239 if test $app_cv_fvisibility_ok = yes; then
240 CFLAGS="$CFLAGS -fvisibility=hidden" 240 CFLAGS="$CFLAGS -fvisibility=hidden"
  241 + OO_CXXFLAGS="$OO_CXXFLAGS -fvisibility=hidden"
241 fi 242 fi
242 243
243 #--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------ 244 #--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------
@@ -273,6 +274,7 @@ AC_ARG_ENABLE([registry], @@ -273,6 +274,7 @@ AC_ARG_ENABLE([registry],
273 274
274 if test "$app_cv_pic" == "yes"; then 275 if test "$app_cv_pic" == "yes"; then
275 DLL_CFLAGS="$DLL_CFLAGS -fPIC" 276 DLL_CFLAGS="$DLL_CFLAGS -fPIC"
  277 + OO_CXXFLAGS="-fPIC $OO_CXXFLAGS"
276 fi 278 fi
277 279
278 AC_ARG_ENABLE([strip],[AS_HELP_STRING([--disable-strip], [disable stripping of binaries])], [ app_cv_strip="$enableval" ],[ app_cv_strip="yes" ]) 280 AC_ARG_ENABLE([strip],[AS_HELP_STRING([--disable-strip], [disable stripping of binaries])], [ app_cv_strip="$enableval" ],[ app_cv_strip="yes" ])
@@ -481,6 +483,38 @@ if test "_$OO_SDK_URE_HOME" == "_" ; then @@ -481,6 +483,38 @@ if test "_$OO_SDK_URE_HOME" == "_" ; then
481 fi 483 fi
482 fi 484 fi
483 485
  486 +# Setup c++ compiler flags
  487 +if test -d "$prefix/include/libreoffice"; then
  488 + OO_CXXFLAGS="$OO_CXXFLAGS -I$prefix/include/libreoffice"
  489 + AC_MSG_NOTICE([Found libreoffice includes at $prefix/include/libreoffice])
  490 +elif test -d "/usr/include/libreoffice"; then
  491 + OO_CXXFLAGS="$OO_CXXFLAGS -I/usr/include/libreoffice"
  492 + AC_MSG_NOTICE([Found libreoffice includes at /usr/include/libreoffice])
  493 +elif test -d "$OO_SDK_HOME/include"; then
  494 + OO_CXXFLAGS="$OO_CXXFLAGS -I$OO_SDK_HOME/include"
  495 + AC_MSG_NOTICE([Found libreoffice includes at $OO_SDK_HOME/include])
  496 +else
  497 + app_cv_office="no"
  498 + AC_MSG_NOTICE([Can't libreoffice includes])
  499 +fi
  500 +
  501 +OO_CXXFLAGS="-DCPPU_ENV=gcc3 -Wno-strict-aliasing $OO_CXXFLAGS"
  502 +
  503 +# Test for IDL files
  504 +if test -d "$OO_SDK_HOME/idl"; then
  505 + IDLDIR="$OO_SDK_HOME/idl"
  506 + AC_MSG_NOTICE([Found idl at $IDLDIR])
  507 +elif test -d "/usr/share/idl/libreoffice"; then
  508 + IDLDIR="/usr/share/idl/libreoffice"
  509 + AC_MSG_NOTICE([Found idl at $IDLDIR])
  510 +elif test -d "$libdir/libreoffice/sdk/idl"; then
  511 + IDLDIR="$libdir/libreoffice/sdk/idl"
  512 + AC_MSG_NOTICE([Found idl at $IDLDIR])
  513 +else
  514 + app_cv_office="no"
  515 + AC_MSG_NOTICE([Can't find idl path])
  516 +fi
  517 +
484 OO_SDK_URE_BIN_DIR=$OO_SDK_URE_HOME/bin 518 OO_SDK_URE_BIN_DIR=$OO_SDK_URE_HOME/bin
485 OO_SDK_URE_LIB_DIR=$OO_SDK_URE_HOME/lib 519 OO_SDK_URE_LIB_DIR=$OO_SDK_URE_HOME/lib
486 520
@@ -531,6 +565,8 @@ fi @@ -531,6 +565,8 @@ fi
531 AC_SUBST(OFFICE_HOME) 565 AC_SUBST(OFFICE_HOME)
532 AC_SUBST(OO_SDK_HOME) 566 AC_SUBST(OO_SDK_HOME)
533 AC_SUBST(OO_SDK_URE_HOME) 567 AC_SUBST(OO_SDK_URE_HOME)
  568 +AC_SUBST(IDLDIR)
  569 +AC_SUBST(OO_CXXFLAGS)
534 570
535 #--[ Pre-reqs ]----------------------------------------------------------------------------------------------------------------------------------------------- 571 #--[ Pre-reqs ]-----------------------------------------------------------------------------------------------------------------------------------------------
536 AC_SUBST(LIB3270_REQUIRES) 572 AC_SUBST(LIB3270_REQUIRES)
pw3270.spec.in
  Diff comments   View file @b3d9820
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 45
46 %if %{?suse_version} >= 1310 46 %if %{?suse_version} >= 1310
47 %define _office 1 47 %define _office 1
48 - %define _bldreq gtk3-devel libopenssl-devel ucpp 48 + %define _bldreq gtk3-devel libopenssl-devel
49 %endif 49 %endif
50 %endif 50 %endif
51 51
@@ -92,6 +92,7 @@ BuildRequires: dbus-1-glib-devel @@ -92,6 +92,7 @@ BuildRequires: dbus-1-glib-devel
92 92
93 %if 0%{?_office} 93 %if 0%{?_office}
94 BuildRequires: libreoffice-sdk 94 BuildRequires: libreoffice-sdk
  95 +BuildRequires: ucpp
95 %endif 96 %endif
96 97
97 BuildRequires: rsvg-view 98 BuildRequires: rsvg-view
src/loffice/Makefile.in
  Diff comments   View file @b3d9820
@@ -72,11 +72,11 @@ BINDIR ?= .bin @@ -72,11 +72,11 @@ BINDIR ?= .bin
72 RDBDIR ?= .rdb 72 RDBDIR ?= .rdb
73 URDDIR ?= .urd 73 URDDIR ?= .urd
74 74
75 -OBJDBG=$(OBJDIR)/Debug  
76 -BINDBG=$(BINDIR)/Debug 75 +OBJDBG ?= $(OBJDIR)/Debug
  76 +BINDBG ?= $(BINDIR)/Debug
77 77
78 -OBJRLS=$(OBJDIR)/Release  
79 -BINRLS=$(BINDIR)/Release 78 +OBJRLS ?= $(OBJDIR)/Release
  79 +BINRLS ?= $(BINDIR)/Release
80 80
81 #---[ lib3270 common class ]--------------------------------------------------- 81 #---[ lib3270 common class ]---------------------------------------------------
82 82
@@ -87,11 +87,13 @@ include $(CLASSLIBDIR)/class.mak @@ -87,11 +87,13 @@ include $(CLASSLIBDIR)/class.mak
87 87
88 #---[ Build options ]---------------------------------------------------------- 88 #---[ Build options ]----------------------------------------------------------
89 89
90 -CPPUENV="gcc3"  
91 -  
92 -CXXFLAGS=@CXXFLAGS@ -fvisibility=hidden @DLL_CFLAGS@ -Wno-strict-aliasing \  
93 - -I../include -I./include -I$(includedir)/libreoffice \  
94 - -DCPPU_ENV=$(CPPUENV) -DLANGUAGE_BINDING_NAME=\"$(CPPUENV)\" 90 +CXXFLAGS=@CXXFLAGS@ @OO_CXXFLAGS@ -I../include -I./include -DLANGUAGE_BINDING_NAME=\"gcc3\"
  91 +#
  92 +#CPPUENV="gcc3"
  93 +#CXXFLAGS=@CXXFLAGS@ -fvisibility=hidden @DLL_CFLAGS@ -Wno-strict-aliasing \
  94 +# -I../include -I./include -I$(includedir)/libreoffice \
  95 +# -DCPPU_ENV=$(CPPUENV) -DLANGUAGE_BINDING_NAME=\"$(CPPUENV)\"
  96 +#
95 97
96 OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \ 98 OO_LDFLAGS=-L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_HOME)/lib \
97 -Wl,-rpath-link=$(OO_SDK_URE_HOME)/lib,-rpath=$(OO_SDK_URE_HOME)/lib \ 99 -Wl,-rpath-link=$(OO_SDK_URE_HOME)/lib,-rpath=$(OO_SDK_URE_HOME)/lib \
@@ -104,7 +106,7 @@ $(URDDIR)/%.urd: %.idl @@ -104,7 +106,7 @@ $(URDDIR)/%.urd: %.idl
104 @$(MKDIR) `dirname $@` 106 @$(MKDIR) `dirname $@`
105 @$(IDLC) -w -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $< 107 @$(IDLC) -w -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $<
106 108
107 -$(URDDIR)/%.urd: /usr/share/idl/libreoffice/%.idl 109 +$(URDDIR)/%.urd: @IDLDIR@/%.idl
108 @echo " IDLC `basename $@`" 110 @echo " IDLC `basename $@`"
109 @$(MKDIR) `dirname $@` 111 @$(MKDIR) `dirname $@`
110 @$(IDLC) -w -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $< 112 @$(IDLC) -w -C -I$(OO_SDK_HOME)/idl -O`dirname $@` $<
@@ -120,15 +122,17 @@ include/%.hpp: $(RDBDIR)/%.rdb @@ -120,15 +122,17 @@ include/%.hpp: $(RDBDIR)/%.rdb
120 @$(CPPUMAKER) -O./include $(TYPES_RDB) $< 122 @$(CPPUMAKER) -O./include $(TYPES_RDB) $<
121 123
122 $(OBJDBG)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \ 124 $(OBJDBG)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \
123 - $(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \  
124 - *.hpp Makefile 125 + $(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \
  126 + globals.hpp \
  127 + Makefile
125 @echo " CC `basename $@`" 128 @echo " CC `basename $@`"
126 @mkdir -p `dirname $@` 129 @mkdir -p `dirname $@`
127 @$(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $< 130 @$(CXX) -DDEBUG=1 $(CXXFLAGS) -o $@ -c $<
128 131
129 $(OBJRLS)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \ 132 $(OBJRLS)/%.o: %.cc include/$(PACKAGE_NAME)/lib3270.hpp \
130 - $(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \  
131 - *.hpp Makefile 133 + $(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \
  134 + globals.hpp \
  135 + Makefile
132 @echo " CC `basename $@`" 136 @echo " CC `basename $@`"
133 @mkdir -p `dirname $@` 137 @mkdir -p `dirname $@`
134 @$(CXX) -DNDEBUG=1 $(CXXFLAGS) -o $@ -c $< 138 @$(CXX) -DNDEBUG=1 $(CXXFLAGS) -o $@ -c $<
@@ -142,7 +146,10 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb @@ -142,7 +146,10 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb
142 146
143 #---[ Release targets ]-------------------------------------------------------- 147 #---[ Release targets ]--------------------------------------------------------
144 148
145 -Release: $(BINDIR)/$(PACKAGE_NAME).oxt 149 +Release: include/$(PACKAGE_NAME)/lib3270.hpp \
  150 + $(foreach CLS, $(UNO_CLASSES), include/$(CLS).hpp) \
  151 + $(RDBDIR)/$(PACKAGE_NAME).rdb \
  152 + $(BINDIR)/$(PACKAGE_NAME).oxt
146 153
147 install: $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \ 154 install: $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \
148 $(RDBDIR)/$(PACKAGE_NAME).rdb \ 155 $(RDBDIR)/$(PACKAGE_NAME).rdb \
src/loffice/globals.hpp
  Diff comments   View file @b3d9820
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 virtual ::sal_Int16 SAL_CALL pfkey( ::sal_Int16 key ) throw (::com::sun::star::uno::RuntimeException); 129 virtual ::sal_Int16 SAL_CALL pfkey( ::sal_Int16 key ) throw (::com::sun::star::uno::RuntimeException);
130 virtual ::sal_Int16 SAL_CALL pakey( ::sal_Int16 key ) throw (::com::sun::star::uno::RuntimeException); 130 virtual ::sal_Int16 SAL_CALL pakey( ::sal_Int16 key ) throw (::com::sun::star::uno::RuntimeException);
131 virtual ::sal_Int16 SAL_CALL quit() throw (::com::sun::star::uno::RuntimeException); 131 virtual ::sal_Int16 SAL_CALL quit() throw (::com::sun::star::uno::RuntimeException);
132 - virtual ::sal_Int16 SAL_CALL erase_eof() throw (::com::sun::star::uno::RuntimeException); 132 + virtual ::sal_Int16 SAL_CALL eraseEOF() throw (::com::sun::star::uno::RuntimeException);
133 133
134 // Cursor 134 // Cursor
135 virtual ::sal_Int32 SAL_CALL setCursorAt( ::sal_Int16 row, ::sal_Int16 col ) throw (::com::sun::star::uno::RuntimeException); 135 virtual ::sal_Int32 SAL_CALL setCursorAt( ::sal_Int16 row, ::sal_Int16 col ) throw (::com::sun::star::uno::RuntimeException);
src/loffice/init.cc
  Diff comments   View file @b3d9820
@@ -56,6 +56,7 @@ session_impl::~session_impl() @@ -56,6 +56,7 @@ session_impl::~session_impl()
56 // XInitialization implementation 56 // XInitialization implementation
57 void session_impl::initialize( Sequence< Any > const & args ) throw (Exception) 57 void session_impl::initialize( Sequence< Any > const & args ) throw (Exception)
58 { 58 {
  59 + /*
59 if (1 != args.getLength()) 60 if (1 != args.getLength())
60 { 61 {
61 throw lang::IllegalArgumentException( 62 throw lang::IllegalArgumentException(
@@ -63,10 +64,16 @@ void session_impl::initialize( Sequence&lt; Any &gt; const &amp; args ) throw (Exception) @@ -63,10 +64,16 @@ void session_impl::initialize( Sequence&lt; Any &gt; const &amp; args ) throw (Exception)
63 (::cppu::OWeakObject *)this, 64 (::cppu::OWeakObject *)this,
64 0 ); 65 0 );
65 } 66 }
  67 + */
66 68
67 - // Initialize 69 + trace("%s args=%d",__FUNCTION__,(int) args.getLength());
68 70
69 - // TODO: Get arguments. 71 + // Process arguments
  72 + for(int f = 0; f < args.getLength();f++)
  73 + {
  74 + trace("Arg(%d) is %s",f,args[f].getValueType().getTypeName().getStr());
  75 +
  76 + }
70 77
71 78
72 } 79 }
src/loffice/pw3270.idl
  Diff comments   View file @b3d9820
@@ -74,7 +74,7 @@ module pw3270 @@ -74,7 +74,7 @@ module pw3270
74 74
75 // Misc actions 75 // Misc actions
76 short quit(); 76 short quit();
77 - short erase_eof(); 77 + short eraseEOF();
78 78
79 // Misc Settings 79 // Misc Settings
80 short setSessionName([in] string name); 80 short setSessionName([in] string name);
src/loffice/set.cc
  Diff comments   View file @b3d9820
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 226
227 } 227 }
228 228
229 - ::sal_Int16 SAL_CALL session_impl::erase_eof() throw (::com::sun::star::uno::RuntimeException) 229 + ::sal_Int16 SAL_CALL session_impl::eraseEOF() throw (::com::sun::star::uno::RuntimeException)
230 { 230 {
231 try 231 try
232 { 232 {
src/loffice/testmacros.odt
View file @b3d9820
No preview for this file type
src/plugins/rx3270/Makefile.in
  Diff comments   View file @b3d9820
@@ -70,7 +70,7 @@ $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$( @@ -70,7 +70,7 @@ $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(
70 $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS) 70 $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS)
71 @echo " CCLD `basename $@`" 71 @echo " CCLD `basename $@`"
72 @$(MKDIR) `dirname $@` 72 @$(MKDIR) `dirname $@`
73 - $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS) 73 + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
74 74
75 install: 75 install:
76 @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugin 76 @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugin