diff options
29 files changed, 103 insertions, 81 deletions
@@ -1,10 +1,17 @@ # backup and temporary files *~ .*.sw[op] +.gitattributes # the build directories /*/unxlng?? /*/unxlng??.pro /*/wntmsc??? /*/wntmsc???.pro -/*/unxmac*.pro
\ No newline at end of file +/*/wntgcc? +/*/wntgcc?.pro +/*/unxmac*.pro +/*/unxios? +/*/unxios?.pro +/*/unxand? +/*/unxand?.pro diff --git a/autodoc/prj/d.lst b/autodoc/prj/d.lst index c73e559f..99ad21da 100644 --- a/autodoc/prj/d.lst +++ b/autodoc/prj/d.lst @@ -1,3 +1,3 @@ -..\%__SRC%\bin\autodoc.exe %_DEST%\bin%_EXT%\autodoc.exe -..\%__SRC%\bin\autodoc %_DEST%\bin%_EXT%\autodoc +..\%__SRC%\bin\autodoc.exe %_DEST%\bin\autodoc.exe +..\%__SRC%\bin\autodoc %_DEST%\bin\autodoc diff --git a/autodoc/source/ary/idl/ia_type.cxx b/autodoc/source/ary/idl/ia_type.cxx index 2caa0d77..57c853a9 100644 --- a/autodoc/source/ary/idl/ia_type.cxx +++ b/autodoc/source/ary/idl/ia_type.cxx @@ -127,7 +127,7 @@ TypeAdmin::lhf_CheckIn_TypeName( const String & i_sLocalName, { String sSearchLocalName( i_sLocalName ); if ( i_templateParameters != 0 - ? i_templateParameters->size() > 0 + ? (!i_templateParameters->empty()) : false ) { sSearchLocalName = MakeTemplateName( diff --git a/autodoc/source/ary_i/kernel/d_token.cxx b/autodoc/source/ary_i/kernel/d_token.cxx index d98fc84d..c2099724 100644 --- a/autodoc/source/ary_i/kernel/d_token.cxx +++ b/autodoc/source/ary_i/kernel/d_token.cxx @@ -60,9 +60,8 @@ DT_TextToken::DisplayAt( DocumentationDisplay & o_rDisplay ) const bool DT_TextToken::IsWhiteOnly() const { - for ( const char * it = sText.c_str(); - static_cast<UINT8>(*it) > 32; - ++it ) + const char *it = sText.c_str(); + while (static_cast<UINT8>(*it++) > 32) { return false; } diff --git a/autodoc/source/display/html/hd_docu.cxx b/autodoc/source/display/html/hd_docu.cxx index 7a5e73d9..29265734 100644 --- a/autodoc/source/display/html/hd_docu.cxx +++ b/autodoc/source/display/html/hd_docu.cxx @@ -182,8 +182,6 @@ Docu_Display::do_Process(const ary::doc::Documentation & i_rData) void Docu_Display::Display_StdTag( const StdTag & i_rData ) { - csv_assert( uintt(i_rData.Std_Id()) < uintt(ary::info::C_eAtTag_NrOfClasses) ); - const ary::info::DocuText::TokenList & rText = i_rData.CText().Tokens(); typedef ary::info::DocuText::TokenList::const_iterator TokenIterator; diff --git a/autodoc/source/display/idl/hfi_doc.cxx b/autodoc/source/display/idl/hfi_doc.cxx index 07ee3db9..017e022b 100644 --- a/autodoc/source/display/idl/hfi_doc.cxx +++ b/autodoc/source/display/idl/hfi_doc.cxx @@ -165,7 +165,7 @@ HF_IdlDocu::Produce_byDocuAndScope( const ce_info & i_rDocu, } } // end for - if (aSeeAlsosWithoutText.size() > 0) + if (!aSeeAlsosWithoutText.empty()) { HF_IdlTag aSeeAlsoTag(Env(), i_rScopeGivingCe); diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx index fd96d0a8..e8171445 100644 --- a/autodoc/source/display/idl/hfi_typetext.cxx +++ b/autodoc/source/display/idl/hfi_typetext.cxx @@ -740,7 +740,7 @@ void HF_IdlTypeText::write_TemplateParameterList( const std::vector<ary::idl::Type_id> & i_templateParameters ) const { - if (i_templateParameters.size() == 0) + if (i_templateParameters.empty()) return; HF_IdlTypeText diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx index 2ce39cb1..1077c9cb 100644 --- a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx +++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx @@ -220,7 +220,7 @@ void Parse::do_clDefaultProject( opt_iter & it, opt_iter itEnd ) { - if ( aProjects.size() > 0 ) + if ( !aProjects.empty() ) { throw X_CommandLine( "Both, named projects and a default project, cannot be used together." ); } diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx index 84ab4b91..4979e2a4 100644 --- a/autodoc/source/parser/cpp/c_rcode.cxx +++ b/autodoc/source/parser/cpp/c_rcode.cxx @@ -139,7 +139,7 @@ CodeExplorer::CurToken() const Cpp_PE & CodeExplorer::CurEnv() const { - csv_assert(aEnvironments.size() > 0); + csv_assert(!aEnvironments.empty()); csv_assert(aEnvironments.back() != 0); return *aEnvironments.back(); diff --git a/cosv/prj/d.lst b/cosv/prj/d.lst index 229161c1..496506b8 100644 --- a/cosv/prj/d.lst +++ b/cosv/prj/d.lst @@ -1,8 +1,8 @@ -mkdir: %_DEST%\inc%_EXT%\cosv -mkdir: %_DEST%\inc%_EXT%\cosv\tpl +mkdir: %_DEST%\inc\cosv +mkdir: %_DEST%\inc\cosv\tpl -..\%__SRC%\lib\cosv.lib %_DEST%\lib%_EXT%\cosv.lib -..\%__SRC%\lib\libcosv.a %_DEST%\lib%_EXT%\libcosv.a -..\inc\cosv\*.hxx %_DEST%\inc%_EXT%\cosv\*.hxx -..\inc\cosv\*.h %_DEST%\inc%_EXT%\cosv\*.h -..\inc\cosv\tpl\*.hxx %_DEST%\inc%_EXT%\cosv\tpl\*.hxx +..\%__SRC%\lib\cosv.lib %_DEST%\lib\cosv.lib +..\%__SRC%\lib\libcosv.a %_DEST%\lib\libcosv.a +..\inc\cosv\*.hxx %_DEST%\inc\cosv\*.hxx +..\inc\cosv\*.h %_DEST%\inc\cosv\*.h +..\inc\cosv\tpl\*.hxx %_DEST%\inc\cosv\tpl\*.hxx diff --git a/cosv/source/fullcpp.mk b/cosv/source/fullcpp.mk index ffbcb980..3103f635 100644 --- a/cosv/source/fullcpp.mk +++ b/cosv/source/fullcpp.mk @@ -31,7 +31,7 @@ # Has to be inlcuded AFTER settings.mk ! -.IF "$(GUI)"=="WNT" +.IF "$(COM)"=="MSC" # RTTI CFLAGS+= -GR @@ -50,8 +50,7 @@ CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBU .ENDIF -.IF "$(OS)"=="LINUX" +.IF "$(COM)"=="GCC" # RTTI CFLAGSCXX+= -frtti .ENDIF - diff --git a/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/odk/examples/CLI/CSharp/Spreadsheet/Makefile index bae593f3..a8dba1cf 100644 --- a/odk/examples/CLI/CSharp/Spreadsheet/Makefile +++ b/odk/examples/CLI/CSharp/Spreadsheet/Makefile @@ -1,13 +1,18 @@ # Builds the SpreadSheet examples of the Developers Guide. +# This Makefile is supposed to be run by a GNU Make built for native +# Windows Not the Cygwin GNU Make, not dmake, not Microsoft's NMAKE. +# But yeah, that is what the setsdkenv_windows.bat file in +# ../../../.. presumably tries to set up. + PRJ = ../../../.. SETTINGS = $(PRJ)/settings include $(SETTINGS)/settings.mk include $(SETTINGS)/std.mk -include $(SETTINGS)/dk.mk +#include $(SETTINGS)/dk.mk -CSC_FLAGS = -warnaserror+ -noconfig +CSC_FLAGS = -warnaserror+ -noconfig -platform:x86 VBC_FLAGS = -warnaserror+ ifeq "$(DEBUG)" "yes" CC_FLAGS+=-Zi -MT @@ -21,7 +26,14 @@ endif THIS_OUT_MISC = $(OUT_MISC)/csharp_SpreadsheetExamples SPREADSHEET_OUT:= $(OUT_BIN)/CSharp_SpreadsheetExamples + +ifneq "$(OUTDIR)" "" +# We are running in a LO build environment, good +CLI_LIB_LOCATION = $(OUTDIR)\bin +else +# Bad guess, but hey, this is how it was CLI_LIB_LOCATION = $(PRJ)\cli +endif # Targets .PHONY : ALL @@ -54,7 +66,7 @@ ViewSample : $(SPREADSHEET_OUT)/ViewSample.exe .PHONY : Info ifeq "$(OS)" "WIN" -Info : SpreadsheetSample GenerateTableSample ViewSample +Info : SpreadsheetSample GeneralTableSample ViewSample @echo ------------------------------------------------------------------------------- @echo Please use one of the following commands to execute the examples! @echo - diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index 1c5e49a0..80be3361 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -36,6 +36,7 @@ #include <osl/interlck.h> #include <osl/mutex.hxx> #include <rtl/uuid.h> +#include <rtl/instance.hpp> #include <cppuhelper/factory.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -172,24 +173,34 @@ Sequence< Type > MyService1Impl::getTypes() seq[ 2 ] = ::cppu::UnoType< Reference< ::my_module::XSomething > >::get(); return seq; } -Sequence< sal_Int8 > MyService1Impl::getImplementationId() - throw (RuntimeException) +namespace { - static Sequence< sal_Int8 > * s_pId = 0; - if (! s_pId) + // class to create an unique id + class UniqueIdInit { - // create unique id - Sequence< sal_Int8 > id( 16 ); - ::rtl_createUuid( (sal_uInt8 *)id.getArray(), 0, sal_True ); - // guard initialization with some mutex - ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() ); - if (! s_pId) + private: + ::com::sun::star::uno::Sequence< sal_Int8 > m_aSeq; + public: + UniqueIdInitIdInit() : m_aSeq(16) { - static Sequence< sal_Int8 > s_id( id ); - s_pId = &s_id; + rtl_createUuid( (sal_uInt8*)m_aSeq.getArray(), 0, sal_True ); } - } - return *s_pId; + const ::com::sun::star::uno::Sequence< sal_Int8 >& getSeq() const { return m_aSeq; } + }; + //A multi-thread safe UniqueIdInitIdInit singleton wrapper + class theService1ImplImplementationId + : public rtl::Static< UniqueIdInitIdInit, + theService1ImplImplementationId > + { + }; +} +Sequence< sal_Int8 > MyService1Impl::getImplementationId() + throw (RuntimeException) +{ + //create a singleton that generates a unique id on + //first initialization and returns the same one + //on subsequent calls. + return theService1ImplImplementationId::get().getSeq(); } // XSomething implementation diff --git a/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java b/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java index 63901b90..a6ca8d38 100644 --- a/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java @@ -100,7 +100,7 @@ public class GraphicExportDemo aProps[0].Value = "WMF"; */ java.io.File destFile = new java.io.File(args[1]); - java.net.URL destUrl = destFile.toURL(); + java.net.URL destUrl = destFile.toURI().toURL(); aProps[1] = new PropertyValue(); aProps[1].Name = "URL"; diff --git a/odk/examples/DevelopersGuide/Forms/URLHelper.java b/odk/examples/DevelopersGuide/Forms/URLHelper.java index 7099dd96..71140957 100644 --- a/odk/examples/DevelopersGuide/Forms/URLHelper.java +++ b/odk/examples/DevelopersGuide/Forms/URLHelper.java @@ -47,7 +47,7 @@ public class URLHelper String sFileURL = null; try { - sFileURL = aSystemPath.toURL().toString(); + sFileURL = aSystemPath.toURI().toURL().toString(); } catch( MalformedURLException exWrong ) { diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java index caed82f4..29b11256 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java @@ -1025,7 +1025,7 @@ public class FunctionHelper // get file URL from the dialog try { - sFileURL = aChooser.getSelectedFile().toURL().toExternalForm(); + sFileURL = aChooser.getSelectedFile().toURI().toURL().toExternalForm(); } catch( MalformedURLException ex ) { diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java index fad1be9c..d226be41 100644 --- a/odk/examples/DevelopersGuide/Text/TextDocuments.java +++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java @@ -425,7 +425,7 @@ public class TextDocuments { if ( xDoc != null ) { sourceFile = new java.io.File(sOutputDir); StringBuffer sStoreFileUrl = new StringBuffer(); - sStoreFileUrl.append(sourceFile.toURL().toString()); + sStoreFileUrl.append(sourceFile.toURI().toURL().toString()); sStoreFileUrl.append("somepopularfileformat.doc"); storeDocComponent(xDoc, sStoreFileUrl.toString() ); diff --git a/odk/examples/DevelopersGuide/UCB/Helper.java b/odk/examples/DevelopersGuide/UCB/Helper.java index dbba9156..791302b7 100644 --- a/odk/examples/DevelopersGuide/UCB/Helper.java +++ b/odk/examples/DevelopersGuide/UCB/Helper.java @@ -179,7 +179,7 @@ public class Helper { try { File file = new File( systemPath ); - String url = file.toURL().toString(); + String url = file.toURI().toURL().toString(); if ( url.charAt( 6 ) != '/' ) { // file:/xxx vs. file:///xxxx StringBuffer buf1 = new StringBuffer( "file:///" ); buf1.append( url.substring( 6 ) ); @@ -217,7 +217,7 @@ public class Helper { buf.append( "resource-" ); buf.append( System.currentTimeMillis() ); File file = new File( buf.toString() ); - String url = file.toURL().toString(); + String url = file.toURI().toURL().toString(); if ( url.charAt( 6 ) != '/' ) { // file:/xxx vs. file:///xxxx StringBuffer buf1 = new StringBuffer( "file:///" ); buf1.append( url.substring( 6 ) ); diff --git a/odk/prj/build.lst b/odk/prj/build.lst index bbb82627..78ea3149 100644 --- a/odk/prj/build.lst +++ b/odk/prj/build.lst @@ -1,4 +1,4 @@ -od odk :: cppuhelper jurt javaunohelper udkapi ridljar offapi autodoc unodevtools external NULL +od odk :: cppuhelper jurt javaunohelper udkapi ridljar offapi autodoc DESKTOP:unodevtools external NULL od odk usr1 - all od_mkout NULL od odk\inc nmake - all od_inc NULL od odk\source\com\sun\star\lib\loader nmake - all od_loader od_inc NULL diff --git a/odk/prj/d.lst b/odk/prj/d.lst index 0af13f2f..a9337ad2 100644 --- a/odk/prj/d.lst +++ b/odk/prj/d.lst @@ -1,5 +1,5 @@ -..\%__SRC%\bin\odkcommon.zip %_DEST%\bin%_EXT%\odkcommon.zip +..\%__SRC%\bin\odkcommon.zip %_DEST%\bin\odkcommon.zip -..\%__SRC%\bin\uno_loader_classes.zip %_DEST%\bin%_EXT%\uno_loader_classes.zip +..\%__SRC%\bin\uno_loader_classes.zip %_DEST%\bin\uno_loader_classes.zip -..\%__SRC%\bin\odkexamples.zip %COMMON_DEST%\bin%_EXT%\odkexamples.zip +..\%__SRC%\bin\odkexamples.zip %COMMON_DEST%\bin\odkexamples.zip diff --git a/odk/settings/stdtarget.mk b/odk/settings/stdtarget.mk index ba99722d..938ab342 100644 --- a/odk/settings/stdtarget.mk +++ b/odk/settings/stdtarget.mk @@ -10,7 +10,8 @@ endif install: $(REGISTERFLAG) $(SDKTYPEFLAG): #$(URE_TYPES) $(OFFICE_TYPES) - -$(MKDIR) $(subst /,$(PS),$(@D)) - -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG))) - $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES) - echo flagged > $@ +# This is a makefile for a standard Make, so must be TABs below + -$(MKDIR) $(subst /,$(PS),$(@D)) + -$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG))) + $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES) + echo flagged > $@ diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java index c9589e2e..64bc7819 100644 --- a/odk/source/com/sun/star/lib/loader/Loader.java +++ b/odk/source/com/sun/star/lib/loader/Loader.java @@ -178,7 +178,7 @@ public final class Loader { if ( fJuh.exists() ) { URL[] clurls = new URL[1]; try { - clurls[0] = fJuh.toURL(); + clurls[0] = fJuh.toURI().toURL(); ClassLoader cl = new CustomURLClassLoader( clurls ); Class c = cl.loadClass( "com.sun.star.comp.helper.UnoInfo" ); @@ -237,7 +237,7 @@ public final class Loader { StringTokenizer tokens = new StringTokenizer( data, delimiter ); while ( tokens.hasMoreTokens() ) { try { - urls.add( new File( tokens.nextToken() ).toURL() ); + urls.add( new File( tokens.nextToken() ).toURI().toURL() ); } catch ( MalformedURLException e ) { // don't add this class path entry to the list of class loader // URLs diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c index 3ea8f88c..72c6665e 100644 --- a/odk/source/unoapploader/unx/unoapploader.c +++ b/odk/source/unoapploader/unx/unoapploader.c @@ -267,7 +267,6 @@ char* createCommandName( char* argv0 ) #ifndef AIX Dl_info dl_info; #endif - int pos; /* get the executable file name from argv0 */ prgname = argv0; @@ -293,7 +292,7 @@ char* createCommandName( char* argv0 ) sep = strrchr( prgname, SEPARATOR ); if ( sep != NULL ) { - pos = ++sep - prgname; + int pos = ++sep - prgname; strncpy( cmdname, prgname, pos ); cmdname[ pos ] = '\0'; strcat( cmdname, CMDPREFIX ); diff --git a/udm/prj/d.lst b/udm/prj/d.lst index 150256da..5dfe7a13 100644 --- a/udm/prj/d.lst +++ b/udm/prj/d.lst @@ -1,9 +1,9 @@ -mkdir: %_DEST%\inc%_EXT%\udm -mkdir: %_DEST%\inc%_EXT%\udm\html -mkdir: %_DEST%\inc%_EXT%\udm\xml +mkdir: %_DEST%\inc\udm +mkdir: %_DEST%\inc\udm\html +mkdir: %_DEST%\inc\udm\xml -..\%__SRC%\lib\udm.lib %_DEST%\lib%_EXT%\udm.lib -..\%__SRC%\lib\libudm.a %_DEST%\lib%_EXT%\libudm.a -..\inc\udm\html\*.hxx %_DEST%\inc%_EXT%\udm\html\*.hxx -..\inc\udm\xml\*.hxx %_DEST%\inc%_EXT%\udm\xml\*.hxx +..\%__SRC%\lib\udm.lib %_DEST%\lib\udm.lib +..\%__SRC%\lib\libudm.a %_DEST%\lib\libudm.a +..\inc\udm\html\*.hxx %_DEST%\inc\udm\html\*.hxx +..\inc\udm\xml\*.hxx %_DEST%\inc\udm\xml\*.hxx diff --git a/unodevtools/prj/build.lst b/unodevtools/prj/build.lst index cc505eee..37f2ef37 100644 --- a/unodevtools/prj/build.lst +++ b/unodevtools/prj/build.lst @@ -1,4 +1,4 @@ -udt unodevtools : codemaker cppuhelper NULL +udt unodevtools : DESKTOP:codemaker cppuhelper NULL udt unodevtools usr1 - all udt_mkout NULL udt unodevtools\inc get - all udt_inc NULL udt unodevtools\prj get - all udt_prj NULL diff --git a/unodevtools/prj/d.lst b/unodevtools/prj/d.lst index 0060b6b9..f4be609e 100644 --- a/unodevtools/prj/d.lst +++ b/unodevtools/prj/d.lst @@ -1,5 +1,5 @@ -..\%__SRC%\bin\uno-skeletonmaker.exe %_DEST%\bin%_EXT%\uno-skeletonmaker.exe -..\%__SRC%\bin\uno-skeletonmaker.pdb %_DEST%\bin%_EXT%\uno-skeletonmaker.pdb +..\%__SRC%\bin\uno-skeletonmaker.exe %_DEST%\bin\uno-skeletonmaker.exe +..\%__SRC%\bin\uno-skeletonmaker.pdb %_DEST%\bin\uno-skeletonmaker.pdb -..\%__SRC%\bin\uno-skeletonmaker %_DEST%\bin%_EXT%\uno-skeletonmaker +..\%__SRC%\bin\uno-skeletonmaker %_DEST%\bin\uno-skeletonmaker diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index a3ce7d5f..f20fa495 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -194,11 +194,11 @@ void generateCompFunctions(std::ostream & o, const OString & nmspace) << " &::cppu::createSingleComponentFactory, 0, 0 },\n" << " { 0, 0, 0, 0, 0, 0 }\n};\n\n"; - o << "extern \"C\" void SAL_CALL component_getImplementationEnvironment(\n" + o << "extern \"C\" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(\n" << " const char ** envTypeName, uno_Environment **)\n{\n" << " *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;\n}\n\n"; - o << "extern \"C\" void * SAL_CALL component_getFactory(\n" + o << "extern \"C\" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(\n" << " const char * implName, void * serviceManager, void * registryKey)\n{\n" << " return ::cppu::component_getFactoryHelper(\n" << " implName, serviceManager, registryKey, entries);\n}\n\n"; diff --git a/unodevtools/source/skeletonmaker/makefile.mk b/unodevtools/source/skeletonmaker/makefile.mk index 6205a1fd..ec0a3821 100644 --- a/unodevtools/source/skeletonmaker/makefile.mk +++ b/unodevtools/source/skeletonmaker/makefile.mk @@ -35,6 +35,12 @@ LIBTARGET := NO ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk + +.IF "$(OS)" == "IOS" +all: + @echo No point in build-time executables for this platform +.ENDIF + .INCLUDE : $(PRJ)$/unodevtools.pmk APP1TARGET = $(TARGET) diff --git a/unodevtools/unodevtools.pmk b/unodevtools/unodevtools.pmk index 91fe33b8..c2d119c2 100755 --- a/unodevtools/unodevtools.pmk +++ b/unodevtools/unodevtools.pmk @@ -42,17 +42,7 @@ COMMONCPPLIBST=commoncpp.lib COMMONJAVALIBST=commonjava.lib .ENDIF -.ELIF "$(GUI)"=="OS2" -UNODEVTOOLSLIBDEPN=unodevtools.lib -CODEMAKERLIBDEPN=codemaker.lib -COMMONCPPLIBDEPN=commoncpp.lib -COMMONJAVALIBDEPN=commonjava.lib -UNODEVTOOLSLIBST=unodevtools.lib -CODEMAKERLIBST=codemaker.lib -COMMONCPPLIBST=commoncpp.lib -COMMONJAVALIBST=commonjava.lib .ELSE - UNODEVTOOLSLIBDEPN=libunodevtools.a CODEMAKERLIBDEPN=libcodemaker.a COMMONCPPLIBDEPN=libcommoncpp.a |