diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-08-22 20:53:49 +0100 |
|---|---|---|
| committer | Tim Retout <tim@retout.co.uk> | 2012-08-22 22:31:53 +0100 |
| commit | 04fd2bf36e7100132f1ee555d9c84640baf1747b (patch) | |
| tree | 0d4615a083b72515d51e1490258d7015a471ec23 /solenv/bin | |
| parent | 46a977081c6f1886f8fff8457c85e6d426dcc20f (diff) | |
installer: Remove unused -javalanguage command-line option.
Change-Id: Ia6f52713dd3cf5ab7d5716c7b6a6f5c1440ed323
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index d8afbe13d006..af8d8dd65e61 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -245,7 +245,6 @@ BEGIN $lastcabfilename = ""; $defaultlanguage = ""; - $javalanguagepath = ""; $addlicensefile = 1; $addsystemintegration = 0; $makedownload = 1; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index c3469b7be6b3..7cbc28da44b0 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -57,7 +57,6 @@ The following parameter are needed: -u: Path, in which zipfiles are unpacked (optional) -msitemplate: Source of the msi file templates (Windows compiler only) -msilanguage: Source of the msi file templates (Windows compiler only) --javalanguage: Source of the Java language files (opt., non-Windows only) -buildid: Current BuildID (optional) -pro: Product version -format: Package format @@ -141,7 +140,6 @@ sub getparameter elsif ($param eq "-msitemplate") { $installer::globals::idttemplatepath = shift(@ARGV); } elsif ($param eq "-msilanguage") { $installer::globals::idtlanguagepath = shift(@ARGV); } elsif ($param eq "-patchinc") { $installer::globals::patchincludepath = shift(@ARGV); } - elsif ($param eq "-javalanguage") { $installer::globals::javalanguagepath = shift(@ARGV); } elsif ($param eq "-buildid") { $installer::globals::buildid = shift(@ARGV); } elsif ($param eq "-copyproject") { $installer::globals::is_copy_only_project = 1; } elsif ($param eq "-languagepack") { $installer::globals::languagepack = 1; } @@ -565,8 +563,6 @@ sub outputparameter if ((!($installer::globals::idtlanguagepath eq "")) && (!($installer::globals::iswindowsbuild))) { push(@output, "msi language path will be ignored for non Windows builds!\n"); } if ((!($installer::globals::iswindowsbuild)) && ( $installer::globals::call_epm )) { push(@output, "Calling epm\n"); } if ((!($installer::globals::iswindowsbuild)) && (!($installer::globals::call_epm))) { push(@output, "Not calling epm\n"); } - if (!($installer::globals::javalanguagepath eq "")) { push(@output, "Java language path: $installer::globals::javalanguagepath\n"); } - if ((!($installer::globals::javalanguagepath eq "")) && ($installer::globals::iswindowsbuild)) { push(@output, "Java language path will be ignored for Windows builds!\n"); } if ( $installer::globals::patchincludepath ) { push(@output, "Patch include path: $installer::globals::patchincludepath\n"); } if ( $installer::globals::tab ) { push(@output, "TAB version\n"); } if ( $installer::globals::strip ) { push(@output, "Stripping files\n"); } |