diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-10 15:52:22 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-08-13 18:05:02 +0200 |
commit | de63d48f9b8be0f5099f054e0978f3e0d3750864 (patch) | |
tree | ccfc60445291e0d2a12295047cbce74e1bc5e089 /test | |
parent | cbb047527d856258b7b925dc37f56f0e9b0b3e90 (diff) |
Related fdo#51252: No more prereg, no more unopkg sync
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either. This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).
Conflicts:
setup_native/prj/d.lst
Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
Signed-off-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/Package_unittest.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk index b861c933e951..fec4dbf28911 100644 --- a/test/Package_unittest.mk +++ b/test/Package_unittest.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/tem $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/standard.bau,user/autotext/en-US/standard.bau)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/crdbus50.bau,user/autotext/en-US/crdbus50.bau)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetup.xpm,user/config/psetup.xpm)) -$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/javasettingsunopkginstall.xml,user/config/javasettingsunopkginstall.xml)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions.xml,user/config/soffice.cfg/simpress/transitions.xml)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions-ogl.xml,user/config/soffice.cfg/simpress/transitions-ogl.xml)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/effects.xml,user/config/soffice.cfg/simpress/effects.xml)) |