API CHANGE: Remove obsolete regcomp from URE

Change-Id: Iaec5e0fd53d340f028e271f28e99a73dedc636f7

Repository.mk

@@ -176,7 +176,6 @@ endif
 ifneq ($(OS),IOS)
 
 $(eval $(call gb_Helper_register_executables,UREBIN,\
-	regcomp \
 	regmerge \
 	regview \
 	uno \

cpputools/Executable_regcomp.mk

-# -*- 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@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,regcomp))
-
-$(eval $(call gb_Executable_use_internal_comprehensive_api,regcomp,\
-    udkapi \
-))
-
-$(eval $(call gb_Executable_use_libraries,regcomp,\
-    cppu \
-    cppuhelper \
-    sal \
-	$(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,regcomp,\
-    cpputools/source/registercomponent/registercomponent \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:

cpputools/Module_cpputools.mk

@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,cpputools,\
 ))
 
 $(eval $(call gb_Module_add_targets,cpputools,\
-    Executable_regcomp \
     Executable_regsingleton \
     Executable_uno \
 ))

cpputools/Package_bin.mk

@@ -28,7 +28,6 @@
 # because the installation system is so incredibly inflexible...
 $(eval $(call gb_Package_Package,cpputools_bin,$(gb_Executable_BINDIR)))
 
-$(eval $(call gb_Package_add_file,cpputools_bin,bin/regcomp.bin,regcomp))
 $(eval $(call gb_Package_add_file,cpputools_bin,bin/uno.bin,uno))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

odk/docs/tools.html

@@ -115,11 +115,6 @@
               <td><a href="#uno-skeletonmaker" title="link to the uno-skeletonmaker tool description">uno-skeletonmaker</a></td>
               <td class="content87">Tool for dumping type definitions on stdout or generating complete code skeletons for Java/C++.</td>
             </tr>
-            <tr valign="top">
-              <td class="content3"><img src="images/arrow-1.gif"></td>
-              <td><a href="#regcomp"  title="link to the regcomp tool description">regcomp</a></td>
-              <td class="content87">A simple UNO component registration tool.</td>
-            </tr>
             <tr valign="top">
               <td class="content3"><img src="images/arrow-1.gif"></td>
               <td><a href="#regmerge"  title="link to the regmerge tool description">regmerge</a></td>
@@ -824,69 +819,6 @@ types the specified types depend on.</p>
   <tr>
     <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
   </tr>
-  <tr>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
-    <td>
-      <table class="table2">
-        <tr>
-		  <td colspan="2" class="head1"><a name="regcomp"/>regcomp</td>
-		  <td align="right">
-		    <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a>
-		    <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a>
-		  </td>
-        </tr>
-		<tr>
-		  <td colspan="3">
-		  <p>'regcomp' is a tool to register|revoke external UNO components
-		  into|from a registry which is used in a UNO environment.</p>
-		  <p class="head2">Usage:</p>
-		  <blockquote>
-		  <b><code>regcomp -revoke [-br&lt;registryfile&gt;] -r &lt;registryfile&gt; -c &lt;locationUrl&gt;[-l&lt;componentLoaderName&gt;]</code></b>
-		  </blockquote>
-		  <p class="head2">Options:</p>
-		  <p>
-		  <table class="table4">
-		  <tr>
-			<td class="cell15"><code>-register|revoke</code></td>
-			<td class="cell85">register means that the components will be
-			installed and revoke means that they will be removed.</td>
-		  </tr>
-		  <tr>
-			<td class="cell15"><code>-br&lt;registryfile&gt;</code></td>
-			<td class="cell85">the name of the registry used for bootstrapping
-			the program. If the bootstrap registry is specified and has the same
-			name as the registration registry, '-r' is optional.</td>
-		  </tr>
-		  <tr>
-			<td class="cell15"><code>-r&lt;registryfile&gt;</code></td>
-			<td class="cell85">the name of the registry (will be created if
-			it does not exist) where the component should be registered.</td>
-		  </tr>
-		  <tr>
-			<td class="cell15"><code>-c&lt;locationUrls&gt;</code></td>
-			<td class="cell85">the location of a component (DLL, Class name,
-			or an url of a jar file) or a list of urls separated by ';'s. Note
-			that, if a list of urls is specified, the components must all need
-			the same loader.</td>
-		  </tr>
-		  <tr>
-			<td class="cell15"><code>-l&lt;componentLoaderName&gt;</code></td>
-			<td class="cell85">the name of the needed loader, if no loader is
-			specified the 'com.sun.star.loader.SharedLibrary' is used. Supported
-			loaders: 'com.sun.star.loader.SharedLibrary' |
-			'com.sun.star.loader.Java'.</td>
-		  </tr>
-		  </table>
-		  </p>
-		  </td>
-		</tr>
-      </table>
-    </td>
-    <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
-  </tr>
-  <tr>
-    <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>
-  </tr>
   <tr>
     <td class="content1"><img class="nothing8" src="images/nada.gif"></td>
     <td>

odk/settings/std.mk

@@ -67,7 +67,6 @@ IDLC="$(OO_SDK_HOME)/bin/idlc"
 CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"
 JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
 REGMERGE="$(OO_SDK_URE_HOME)/bin/regmerge"
-REGCOMP="$(OO_SDK_URE_HOME)/bin/regcomp"
 
 SDK_JAVA_UNO_BOOTSTRAP_FILES=\
     -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \

odk/util/odk_rules.pmk

@@ -89,10 +89,6 @@ $(DESTDIRBIN)/%.bin : $(BINOUT)/%.bin
     @@-rm -f $@
     $(GNUCOPY) $(BINOUT)/$(@:f) $@
 
-$(DESTDIRBIN)/regcomp : $(BINOUT)/regcomp
-    @@-rm -f $@
-    $(MY_TEXTCOPY) $< $@
-
 $(DESTDIRBIN)/unoapploader$(EXEPOSTFIX) : $(BIN)/unoapploader$(EXEPOSTFIX)
     @@-rm -f $@
     $(GNUCOPY) $(BIN)/$(@:f) $@

scp2/source/ooo/ure.scp

@@ -91,25 +91,6 @@ Shortcut gid_Shortcut_Exe_Uno
 End
 #endif
 
-#if defined WNT
-File gid_File_Exe_Regcomp
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(regcomp);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D51FA672-7C24-4E24-A282-872C4BF690A1";
-End
-#endif
-
-#ifndef WNT
-Shortcut gid_Shortcut_Exe_Regcomp
-    FileID = gid_File_Exe_StartupSh;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(regcomp);
-    Styles = (RELATIVE);
-End
-#endif
-
 File gid_File_Exe_Regmerge
     BIN_FILE_BODY;
     Dir = gid_Dir_Ure_Bin;
@@ -158,16 +139,6 @@ File gid_File_Exe_UnoBin
 End
 #endif
 
-#if !defined WNT
-File gid_File_Exe_RegcompBin
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = "regcomp.bin";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "70FBE546-A228-455F-BCBB-716BF03AD5C6";
-End
-#endif
-
 // Public Dynamic Libraries:
 
 File gid_File_Dl_Cppu
@@ -989,13 +960,11 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Readme_Ure,
             gid_File_License_Ure,
             gid_File_Exe_Uno,
-            gid_File_Exe_Regcomp,
             gid_File_Exe_Regmerge,
             gid_File_Exe_Regview,
             gid_File_Exe_Javaldx,
             gid_File_Exe_StartupSh,
             gid_File_Exe_UnoBin,
-            gid_File_Exe_RegcompBin,
             gid_File_Dl_Cli_Uno,
             gid_File_Dl_Cli_Ure_Assembly,
             gid_File_Dl_Policy_Cli_Ure_Assembly,

solenv/bin/guw.pl

@@ -41,7 +41,6 @@ use Text::ParseWords;
                          'MAP', 'NODEFAULTLIB', 'OPT', 'PDB', 'RELEASE',
                          'SUBSYSTEM', 'STACK', 'out:', 'map:', 'ENTRY:',
                          'implib:', 'delayload:', 'def', 'COMMENT:' ],
-               'regcomp', [ '-env:', 'vnd.sun.star.expand:' , 'vnd.openoffice.pymodule' ],
                'regmerge', [ '/UCR' ],
                'rc', [ '-D' ],
                'rsc', [ '-DOOO_' ] );

solenv/inc/settings.mk

@@ -974,11 +974,6 @@ IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc
 REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regmerge
 REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regcompare
 
-.IF "$(DEBUGREGCOMP)" != "" || "$(debugregcomp)" != ""
-GDBREGCOMPTRACE=$(GDBTRACE)
-.ENDIF
-
-REGCOMP*=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp
 CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker
 JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
 RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker

ure/source/README

@@ -25,7 +25,6 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/THIRDPARTYLICENSEREADME.html
 /opt/openoffice.org/ure/README
 /opt/openoffice.org/ure/bin/uno
-/opt/openoffice.org/ure/bin/regcomp
 /opt/openoffice.org/ure/bin/regmerge
 /opt/openoffice.org/ure/bin/regview
 /opt/openoffice.org/ure/bin/javaldx
@@ -48,7 +47,6 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/libstdc++.so.6  [external; Linux x86 only]
 /opt/openoffice.org/ure/bin/startup.sh  [private]
 /opt/openoffice.org/ure/bin/uno.bin  [private]
-/opt/openoffice.org/ure/bin/regcomp.bin  [private]
 /opt/openoffice.org/ure/lib/unorc  [private]
 /opt/openoffice.org/ure/lib/libreg.so.3  [private]
 /opt/openoffice.org/ure/lib/libstore.so.3  [private]
@@ -95,7 +93,6 @@ Program Files\URE\LICENSE
 Program Files\URE\THIRDPARTYLICENSEREADME.html
 Program Files\URE\README
 Program Files\URE\bin\uno.exe
-Program Files\URE\bin\regcomp.exe
 Program Files\URE\bin\regmerge.exe
 Program Files\URE\bin\regview.exe
 Program Files\URE\bin\cppu3.dll
@@ -183,13 +180,13 @@ A URE installation contains the following public files:
 - uno is the executable file that runs UNO components.  For more details, see
 the SDK Developer's Guide.
 
-- regcomp, regmerge, and regview are tools that work with binary registries that
-contain UNO type or UNO service information.  For more details, see the SDK
-Developer's Guide.
+- regmerge and regview are tools that work with binary registries that contain
+UNO type or UNO service information.  For more details, see the SDK Developer's
+Guide.
 
 - javaldx is a helper program on Linux x86, Solaris x86, and Solaris SPARC that
 enables Java executables to use a Java VM, such as the Sun JDK/JRE.  Executables
-such as uno and regcomp run this helper automatically.
+such as uno run this helper automatically.
 
 - cppu, cppuhelper, purpenvhelper, sal, and salhelper are the public C++ UNO
 runtime dynamic libraries that client code can call.  For details on the
@@ -264,11 +261,6 @@ For details on how to override the UNO deployment variables, see the SDK
 Developer's Guide or go to http://udk.openoffice.org/common/man/concept/
 micro_deployment.html.
 
-If you want to deploy additional UNO types and services, use regcomp.
-
-CAUTION: Do not deploy these types and services to the types.rdb and
-services.rdb in the URE installation.
-
 
 URE Java Framework
 ------------------