commit 5784cafe46338d3b94818213a4443d11c1324af9
author Michael Stahl <mstahl@redhat.com> Tue Feb 04 20:56:25 2014 +0100
committer Michael Stahl <mstahl@redhat.com> Tue Feb 04 21:16:16 2014 +0100
tree 0a0f81a7e45555c457af0a1cf504585c1e90878c
parent ba26251f4d2b76f7f3e027d75542e8e0965a2aed

scp2: migrate URE Packages to AutoInstall

Change-Id: I98a272e8cf009aa04bbd07ee333f9853e2a906d2

Repository.mk

diff --git a/Repository.mk b/Repository.mk
index 98c9da5..9f5a723 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -697,6 +697,15 @@ $(eval $(call gb_Helper_register_jars,NONE,\
))
endif

$(eval $(call gb_Helper_register_packages_for_install,ure,\
	ure_install \
	$(if $(ENABLE_JAVA),\
		jvmfwk_javavendors \
		jvmfwk_jreproperties \
		$(if $(filter MACOSX,$(OS)),bridges_jnilib_java_uno) \
	) \
))

# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
	genbrk \

scp2/source/ooo/ure.scp

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 8bd22f9..7069ee6 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -265,30 +265,6 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
End
#endif

File gid_File_ure_install
    Dir = FILELIST_DIR;
    Name = "ure_install.filelist";
    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED);
End


#if defined ENABLE_JAVA
File gid_File_Dl_JrepropertiesClass
    TXT_FILE_BODY;
    Dir = FILELIST_DIR;
    Name = "jvmfwk_jreproperties.filelist";
    Styles = (FILELIST, PACKED);
End
#endif

#if defined ENABLE_JAVA && defined MACOSX
File gid_File_bridges_jnilib_java_uno
    Dir = FILELIST_DIR;
    Name = "bridges_jnilib_java_uno.filelist";
    Styles = (FILELIST);
End
#endif


#if defined _MSC_VER
File gid_File_Dl_Cli_Uno
@@ -526,17 +502,6 @@ File gid_File_Misc_ServicesRdb
    Styles = (PACKED);
End

// Private Miscellaneous Files:

#if defined ENABLE_JAVA
File gid_File_Misc_JavavendorsXml
    TXT_FILE_BODY;
    Dir = FILELIST_DIR;
    Name = "jvmfwk_javavendors.filelist";
    Styles = (FILELIST, PACKED);
End
#endif

//Module

Module gid_Module_Root_Ure_Hidden
@@ -585,9 +550,6 @@ Module gid_Module_Root_Ure_Hidden
            gid_Unixlink_File_Dl_Salhelper,
            gid_File_Dl_Profile_Uno,
            gid_Unixlink_File_Dl_Rmcxt,
            gid_File_Dl_JrepropertiesClass,
            gid_File_bridges_jnilib_java_uno,
            gid_File_ure_install,
            gid_File_Dl_Jpipe,
            gid_File_Dl_Jpipx,
            gid_File_Dl_Libxml2,
@@ -599,8 +561,7 @@ Module gid_Module_Root_Ure_Hidden
            gid_File_Lib_Msvcm80_Ure,
            gid_File_Msvcm80crt_Manifest_Ure,
            gid_File_Misc_TypesRdb,
            gid_File_Misc_ServicesRdb,
            gid_File_Misc_JavavendorsXml);
            gid_File_Misc_ServicesRdb);
    Unixlinks = (gid_Unixlink_File_Dl_Sal,
                 gid_Unixlink_File_Dl_Salhelper,
                 gid_Unixlink_File_Dl_Cppu,