diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 14:51:18 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:21 +0100 |
| commit | 364f8a577179e0b3fc2a458763504c97a36710e6 (patch) | |
| tree | d08f6dafc5d7e590fb88a8927386a8669179bb00 | |
| parent | bfc1108958d77aca6462f5c6b8ba097fd5f5a264 (diff) | |
setup_native: these 2 mac files are already hard-coded in installer
Change-Id: Ie7cbd70018a58a43ed25b207b243e1ebc2f2b9d6
| -rw-r--r-- | setup_native/Package_misc.mk | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk index 48b87d462d9e..d154c887e69d 100644 --- a/setup_native/Package_misc.mk +++ b/setup_native/Package_misc.mk @@ -11,8 +11,6 @@ $(eval $(call gb_Package_Package,setup_native/misc,$(SRCDIR)/setup_native/source $(eval $(call gb_Package_set_outdir,setup_native/misc,$(OUTDIR))) -$(eval $(call gb_Package_add_file,setup_native/misc,bin/Info.plist.langpack,mac/Info.plist.langpack)) -$(eval $(call gb_Package_add_file,setup_native/misc,bin/ooo3_installer.icns,mac/ooo3_installer.icns)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store,mac/ooo/DS_Store)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Dev,mac/ooo/DS_Store_Dev)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Langpack,mac/ooo/DS_Store_Langpack)) diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 71e10d44e372..ef42bdbc5bda 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -377,19 +377,18 @@ sub create_package # Copy also Info.plist and icon file # Finding both files in solver my $iconfile = "ooo3_installer.icns"; - my $iconfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$iconfile, $includepatharrayref, 0); - if ($$iconfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script icon file $iconfile!", "create_package"); } + my $iconfileref = $ENV{'SRCDIR'} . "/setup_native/source/mac/" . $iconfile; + if (! -f $iconfileref) { installer::exiter::exit_program("ERROR: Could not find Apple script icon file $iconfile ($iconfileref)!", "create_package"); } my $subdir = $contentsfolder . "/" . "Resources"; if ( ! -d $subdir ) { installer::systemactions::create_directory($subdir); } $destfile = $subdir . "/" . $iconfile; - installer::systemactions::copy_one_file($$iconfileref, $destfile); + installer::systemactions::copy_one_file($iconfileref, $destfile); - my $infoplistfile = "Info.plist.langpack"; my $installname = "Info.plist"; - my $infoplistfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$infoplistfile, $includepatharrayref, 0); - if ($$infoplistfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script Info.plist: $infoplistfile!", "create_package"); } + my $infoplistfile = $ENV{'SRCDIR'} . "/setup_native/source/mac/Info.plist.langpack"; + if (! -f $infoplistfile) { installer::exiter::exit_program("ERROR: Could not find Apple script Info.plist: $infoplistfile!", "create_package"); } $destfile = $contentsfolder . "/" . $installname; - installer::systemactions::copy_one_file($$infoplistfileref, $destfile); + installer::systemactions::copy_one_file($infoplistfile, $destfile); # Replacing variables in Info.plist $scriptfilecontent = installer::files::read_file($destfile); |