[Libreoffice-commits] .: 3 commits - cpputools/Executable_regsingleton.mk cpputools/Module_cpputools.mk cpputools/source Repository.mk ure/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Dec 19 00:55:53 PST 2012
Repository.mk | 1
cpputools/Executable_regsingleton.mk | 53 -------
cpputools/Module_cpputools.mk | 1
cpputools/source/regsingleton/regsingleton.cxx | 167 -------------------------
cpputools/source/unoexe/unoexe.cxx | 6
ure/source/uretest/JavaNative.java | 4
ure/source/uretest/Makefile | 33 +---
ure/source/uretest/Makefile.pln | 31 +---
ure/source/uretest/cppmain.cc | 1
9 files changed, 30 insertions(+), 267 deletions(-)
New commits:
commit e87e9ab402f34bd347a991a19aef40e14b2abdb6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Dec 19 09:41:20 2012 +0100
Missing "_" in prefixes
...likely gone unnoticed until now as that nested if is not normally taken, the
createInstanceWithContext call at the top shall normally succeed.
Change-Id: Iabc917473cf6902cb2afc21b735411d8136278fb
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 20256ae..54d02de 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -232,21 +232,21 @@ void createInstance(
OUString(),
OUString( "com.sun.star.comp.io.Acceptor" ),
xSF, Reference< XRegistryKey >(),
- "acceptor" ) ) );
+ "acceptor_" ) ) );
// connector
xSet->insert( makeAny( loadSharedLibComponentFactory(
OUString( "connector.uno" SAL_DLLEXTENSION ),
OUString(),
OUString( "com.sun.star.comp.io.Connector" ),
xSF, Reference< XRegistryKey >(),
- "connector" ) ) );
+ "connector_" ) ) );
// bridge factory
xSet->insert( makeAny( loadSharedLibComponentFactory(
OUString( "binaryurp.uno" SAL_DLLEXTENSION ),
OUString(),
OUString( "com.sun.star.comp.bridge.BridgeFactory" ),
xSF, Reference< XRegistryKey >(),
- "binaryurp" ) ) );
+ "binaryurp_" ) ) );
}
s_bSet = sal_True;
}
commit 0c1dc375b4bf0c8ff01fe51921767faa703b1295
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Dec 18 18:01:35 2012 +0100
Make ure/source/uretest/ use defaultBootstrap_InitialComponentContext
...instead of the ure executable's obsolte -ro arguments (leading to usage of
deprecated bootstrap_InitialComponentContext with an XSimpleRegistry instead).
The com.sun.star.lang.MultiServiceFactory service is (only) implemented by the
cppuhelper/source/defaultbootstrap.cxx ServiceManager itself, but it doesn't add
itself to its list of know services, so cppmain.cc should not test for it.
Change-Id: Iaaf8d466fe3607ab9bac6aba09396809e53404f3
diff --git a/ure/source/uretest/JavaNative.java b/ure/source/uretest/JavaNative.java
index 7829f8c..289f009 100644
--- a/ure/source/uretest/JavaNative.java
+++ b/ure/source/uretest/JavaNative.java
@@ -23,9 +23,7 @@ import test.java.tester.Tester;
public final class JavaNative {
public static void main(String[] arguments) throws Exception {
- Tester.test(
- Bootstrap.defaultBootstrap_InitialComponentContext(
- arguments[0], null));
+ Tester.test(Bootstrap.defaultBootstrap_InitialComponentContext());
}
private JavaNative() {}
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index 8c39907..8ff1c04 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -61,36 +61,35 @@ test-cpptest: out.sdk/cppmain.uno.$(SHAREDLIB_EXT) out.sdk/types.rdb \
out.sdk/services.rdb
$(GCCS_COMPAT) uno \
-c test.cpp.cppmain.Component -l $(URLPREFIX)$(cwd)/$< \
- -ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
- -ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" \
- -ro out.sdk/services.rdb
+ -env:URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
+ -env:URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb
.PHONY: test-javatest
test-javatest: out.sdk/javamain.uno.jar out.sdk/types.rdb out.sdk/services.rdb
$(GCCS_COMPAT) uno \
-c test.java.javamain.Component -l $(URLPREFIX)$(cwd)/$< \
- -ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
- -ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" \
- -ro out.sdk/services.rdb
+ -env:URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
+ -env:URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb
.PHONY: test-javanative
test-javanative: out.sdk/runner.jar out.sdk/javanative.jar \
- out.sdk/javanative.rc out.sdk/services.rdb out.sdk/types.rdb
- $(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar $(ure_java_url)/ \
- $(URLPREFIX)$(cwd)/out.sdk/javanative.jar \
- $(URLPREFIX)$(cwd)/out.sdk/javanative.rc
+ out.sdk/services.rdb out.sdk/types.rdb
+ URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
+ URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb \
+ $(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar \
+ $(ure_java_url)/ $(URLPREFIX)$(cwd)/out.sdk/javanative.jar
do_server = $(GCCS_COMPAT) uno -c test.cpp.cppserver.Component \
-l $(URLPREFIX)$(cwd)/out.sdk/cppserver.uno.$(SHAREDLIB_EXT) \
- -ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
- -ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" -ro out.sdk/services.rdb \
+ -env:URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \
+ -env:URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb \
-u "uno:pipe,name=ure_test;urp;server" --singleaccept
do_client = $(SDK_JAVA) -jar out.sdk/runner.jar $(ure_java_url)/ \
$(URLPREFIX)$(cwd)/out.sdk/javaclient.jar \
"uno:pipe,name=ure_test;urp;server"
.PHONY: test-clientserver
-test-clientserver: out.sdk/cppserver.uno.$(SHAREDLIB_EXT) out.sdk/runner.jar \
- out.sdk/javaclient.jar
+test-clientserver: out.sdk/cppserver.uno.$(SHAREDLIB_EXT) out.sdk/types.rdb \
+ out.sdk/services.rdb out.sdk/runner.jar out.sdk/javaclient.jar
ifeq "$(PLATFORM)" "windows"
echo $(subst %,%%,$(do_server)) > out.sdk/server.bat
echo $(subst %,%%,$(do_client)) > out.sdk/client.bat
@@ -234,12 +233,6 @@ out.sdk/class/javanative/test/java/javanative/JavaNative.class: \
-classpath "$(CLASSPATH)$(PATH_SEPARATOR)out.sdk/tester.jar" \
-sourcepath . -d out.sdk/class/javanative $<
-out.sdk/javanative.rc: | out.sdk
- echo $(qt2)URE_INTERNAL_LIB_DIR=$${$(subst :,\u003A,$(ure_unorc_url)):URE_INTERNAL_LIB_DIR}$(qt2) > $@
- echo $(qt2)URE_INTERNAL_JAVA_DIR=$${$(subst :,\u003A,$(ure_unorc_url)):URE_INTERNAL_JAVA_DIR}$(qt2) >> $@
- echo $(qt2)UNO_TYPES=$${$(subst :,\u003A,$(ure_unorc_url)):UNO_TYPES} $(URLPREFIX)$(cwd)/out.sdk/types.rdb$(qt2) >> $@
- echo $(qt2)UNO_SERVICES=$${$(subst :,\u003A,$(ure_unorc_url)):UNO_SERVICES} $(URLPREFIX)$(cwd)/out.sdk/services.rdb$(qt2) >> $@
-
out.sdk/javaclient.jar: \
out.sdk/class/javaclient/test/java/javaclient/JavaClient.class \
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index fef981a..9ff84ec 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -40,31 +40,32 @@ test-regview: out.pln/types.rdb
test-cpptest: out.pln/cppmain.uno.so out.pln/types.rdb out.pln/services.rdb
$(GCCS_COMPAT) $(URE_HOME)/bin/uno \
-c test.cpp.cppmain.Component -l file://$(PWD)/$< \
- -ro $(URE_HOME)/share/misc/types.rdb -ro out.pln/types.rdb \
- -ro $(URE_HOME)/share/misc/services.rdb -ro out.pln/services.rdb
+ -env:URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
+ -env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb
.PHONY: test-javatest
test-javatest: out.pln/javamain.uno.jar out.pln/types.rdb out.pln/services.rdb
$(GCCS_COMPAT) $(URE_HOME)/bin/uno \
-c test.java.javamain.Component -l file://$(PWD)/$< \
- -ro $(URE_HOME)/share/misc/types.rdb -ro out.pln/types.rdb \
- -ro $(URE_HOME)/share/misc/services.rdb -ro out.pln/services.rdb
+ -env:URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
+ -env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb
.PHONY: test-javanative
test-javanative: out.pln/runner.jar out.pln/javanative.jar \
- out.pln/javanative.rc out.pln/services.rdb out.pln/types.rdb
- $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/lib java \
+ out.pln/types.rdb out.pln/services.rdb
+ URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
+ URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \
+ $(GCCS_COMPAT) LD_LIBRARY_PATH=$(URE_HOME)/lib java \
-jar out.pln/runner.jar file://$(URE_HOME)/share/java/ \
- file://$(PWD)/out.pln/javanative.jar \
- file://$(PWD)/out.pln/javanative.rc
+ file://$(PWD)/out.pln/javanative.jar
.PHONY: test-clientserver
-test-clientserver: out.pln/cppserver.uno.so out.pln/runner.jar \
- out.pln/javaclient.jar
+test-clientserver: out.pln/cppserver.uno.so out.pln/types.rdb \
+ out.pln/services.rdb out.pln/runner.jar out.pln/javaclient.jar
$(GCCS_COMPAT) $(URE_HOME)/bin/uno -c test.cpp.cppserver.Component \
-l file://$(PWD)/out.pln/cppserver.uno.so \
- -ro $(URE_HOME)/share/misc/types.rdb -ro out.pln/types.rdb \
- -ro $(URE_HOME)/share/misc/services.rdb \
+ -env:URE_MORE_TYPES=file://$(PWD)/out.pln/types.rdb \
+ -env:URE_MORE_SERVICES=file://$(PWD)/out.pln/services.rdb \
-u 'uno:pipe,name=ure_test;urp;server' --singleaccept &
sleep 5 && \
java -jar out.pln/runner.jar file://$(URE_HOME)/share/java/ \
@@ -217,12 +218,6 @@ out.pln/class/javanative/test/java/javanative/JavaNative.class: \
$(URE_HOME)/share/java/juh.jar:$(URE_HOME)/share/java/ridl.jar:out.pln/tester.jar \
-sourcepath . -d out.pln/class/javanative $<
-out.pln/javanative.rc: | out.pln
- echo 'URE_INTERNAL_LIB_DIR=$${file\u003A//$(URE_HOME)/lib/unorc:URE_INTERNAL_LIB_DIR}' > $@
- echo 'URE_INTERNAL_JAVA_DIR=$${file\u003A//$(URE_HOME)/lib/unorc:URE_INTERNAL_JAVA_DIR}' >> $@
- echo 'UNO_TYPES=$${file\u003A//$(URE_HOME)/lib/unorc:UNO_TYPES} file://$(PWD)/out.pln/types.rdb' >> $@
- echo 'UNO_SERVICES=$${file\u003A//$(URE_HOME)/lib/unorc:UNO_SERVICES} file://$(PWD)/out.pln/services.rdb' >> $@
-
out.pln/javaclient.jar: \
out.pln/class/javaclient/test/java/javaclient/JavaClient.class \
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index ab0c92d..41fc255 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -104,7 +104,6 @@ private:
"com.sun.star.io.TextInputStream",
"com.sun.star.io.TextOutputStream",
"com.sun.star.java.JavaVirtualMachine",
- "com.sun.star.lang.MultiServiceFactory",
"com.sun.star.lang.RegistryServiceManager",
"com.sun.star.lang.ServiceManager",
"com.sun.star.loader.Java",
commit 9780454ab8eb6a3f25c1bcff08dc30aaa9cc1bfe
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Dec 18 17:03:21 2012 +0100
Remove obsolete regsingleton
Change-Id: Ia8b83e69401dccd37c3350e381093af1dd5b17af
diff --git a/Repository.mk b/Repository.mk
index 5495aab..46a0979 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
pdfunzip \
rdbedit \
propex \
- regsingleton \
regsvrex \
renewpo \
rsc \
diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk
deleted file mode 100644
index 0d3354d..0000000
--- a/cpputools/Executable_regsingleton.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Executable_Executable,regsingleton))
-
-$(eval $(call gb_Executable_use_internal_comprehensive_api,regsingleton,\
- udkapi \
-))
-
-$(eval $(call gb_Executable_use_libraries,regsingleton,\
- cppu \
- cppuhelper \
- sal \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,regsingleton,\
- cpputools/source/regsingleton/regsingleton \
-))
-
-ifneq ($(gb_DEBUGLEVEL),0)
-ifeq ($(COM),MSC)
-$(eval $(call gb_Executable_add_cxxflags,regsingleton,\
- -Ob0 \
-))
-endif
-endif
-
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
index 504d281..0a504da 100644
--- a/cpputools/Module_cpputools.mk
+++ b/cpputools/Module_cpputools.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,cpputools,\
))
$(eval $(call gb_Module_add_targets,cpputools,\
- Executable_regsingleton \
Executable_uno \
))
diff --git a/cpputools/source/regsingleton/regsingleton.cxx b/cpputools/source/regsingleton/regsingleton.cxx
deleted file mode 100644
index 7224434..0000000
--- a/cpputools/source/regsingleton/regsingleton.cxx
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <stdio.h>
-
-#include "sal/main.h"
-#include <osl/diagnose.h>
-#include <osl/file.h>
-
-#include <cppuhelper/bootstrap.hxx>
-
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
-
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-static void print_options() SAL_THROW(())
-{
- printf(
- "\nusage: regsingleton [-r|-ra] registry_file singleton_name[=service_name] ...\n\n"
- "Inserts a singleton entry into rdb.\n"
- "Option -r revokes given entries, -ra revokes all entries.\n" );
-}
-
-//==================================================================================================
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-{
- if (argc < 3)
- {
- print_options();
- return 1;
- }
-
- bool insert_entry = true;
- bool remove_all = false;
- int nPos = 1;
- if ('-' == argv[ nPos ][ 0 ] && 'r' == argv[ nPos ][ 1 ])
- {
- if ('a' == argv[ nPos ][ 2 ] && '\0' == argv[ nPos ][ 3 ])
- {
- remove_all = true;
- }
- else if ('\0' != argv[ nPos ][ 2 ])
- {
- print_options();
- return 1;
- }
- insert_entry = false;
- ++nPos;
- }
-
- OUString sys_path( OUString::createFromAscii( argv[ nPos ] ) );
- OUString file_url;
- oslFileError rc = osl_getFileURLFromSystemPath( sys_path.pData, &file_url.pData );
- if (osl_File_E_None != rc)
- {
- fprintf( stderr, "\nerror: cannot make file url out of %s\n", argv[ nPos ] );
- return 1;
- }
- ++nPos;
-
- try
- {
- Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
- xSimReg->open( file_url, sal_False, sal_True );
- Reference< registry::XRegistryKey > xRoot( xSimReg->getRootKey() );
-
- if (remove_all)
- {
- try
- {
- xRoot->deleteKey( OUSTR("SINGLETONS") );
- }
- catch (registry::InvalidRegistryException & exc)
- {
- OString cstr_msg(
- OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
- fprintf(
- stderr, "\nwarning: removing all singletons failed: %s\n",
- cstr_msg.getStr() );
- }
- }
- else
- {
- Reference< registry::XRegistryKey > xKey( xRoot->openKey( OUSTR("SINGLETONS") ) );
- if (! xKey.is())
- xKey = xRoot->createKey( OUSTR("SINGLETONS") );
-
- for ( ; nPos < argc; ++nPos )
- {
- OUString singleton( OUString::createFromAscii( argv[ nPos ] ) );
- OUString service;
- sal_Int32 eq = singleton.indexOf( '=' );
- if (eq >= 0)
- {
- service = singleton.copy( eq +1 );
- singleton = singleton.copy( 0, eq );
- }
-
- if (insert_entry)
- {
- if (!service.isEmpty())
- {
- Reference< registry::XRegistryKey > xEntry( xKey->openKey( singleton ) );
- if (! xEntry.is())
- xEntry = xKey->createKey( singleton );
- xEntry->setStringValue( service );
- }
- else
- {
- OString entry( OUStringToOString( singleton, RTL_TEXTENCODING_ASCII_US ) );
- fprintf(
- stderr, "\nwarning: no service name given for singleton %s!\n",
- entry.getStr() );
- }
- }
- else
- {
- try
- {
- xKey->deleteKey( singleton );
- }
- catch (registry::InvalidRegistryException & exc)
- {
- OString cstr_singleton(
- OUStringToOString( singleton, RTL_TEXTENCODING_ASCII_US ) );
- OString cstr_msg(
- OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
- fprintf(
- stderr, "\nwarning: singleton %s is not registered: %s\n",
- cstr_singleton.getStr(), cstr_msg.getStr() );
- }
- }
- }
- }
-
- return 0;
- }
- catch (Exception & rExc)
- {
- OString msg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
- fprintf( stderr, "\nerror: %s\n", msg.getStr() );
- return 1;
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list