Kaydet (Commit) c7e3f88b authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Fix Mac build fallout from PRODUCTEXTENSION change

PRODUCTEXTENSION used to be empty. (No idea for how long it had been
empty.) And apparently some of the "installer" Perl code implicitly
assumed PRODUCTEXTENSION was empty. At least, producing the langpack
dmg for Mac started to fail when PRODUCTEXTENSION was no longer empty.
üst 8ab3715d
...@@ -278,13 +278,11 @@ sub create_package ...@@ -278,13 +278,11 @@ sub create_package
$folder = $packagename; $folder = $packagename;
} }
# my $volume_name = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'}; # Adding PRODUCTVERSION makes this difficult to maintain!
my $volume_name = $allvariables->{'PRODUCTNAME'}; my $volume_name = $allvariables->{'PRODUCTNAME'};
my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'}; my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'};
my $volume_name_classic_app = $volume_name; # "app" should not contain version number my $volume_name_classic_app = $volume_name; # "app" should not contain version number
# $volume_name = $volume_name . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'}; # Adding PRODUCTEXTENSION makes this difficult to maintain! $volume_name_classic = $volume_name_classic;
$volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'}; $volume_name_classic_app = $volume_name_classic_app;
$volume_name_classic_app = $volume_name_classic_app . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'};
if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) { if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) {
$volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'}; $volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
$volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'}; $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment