diff options
author | Andreas Enge <andreas@enge.fr> | 2015-03-06 22:45:47 +0100 |
---|---|---|
committer | Andreas Enge <andreas@enge.fr> | 2015-03-07 10:45:47 +0100 |
commit | ed2b1c4f5583ebe850bedc0b275b03bdab7c9a84 (patch) | |
tree | ef17b6155d4916f0bfb9b481b44128d91f44c4af /gnu/packages/javac.in | |
parent | e2808a4ac678daf8aafe73406f46afd9937913c7 (diff) | |
download | patches-ed2b1c4f5583ebe850bedc0b275b03bdab7c9a84.tar patches-ed2b1c4f5583ebe850bedc0b275b03bdab7c9a84.tar.gz |
gnu: gcj: Move javac.in from a file in the distribution to an origin.
* gnu/packages/javac.in: Delete file.
* gnu-system.am (MISC_DISTRO_FILES): Delete.
* gnu/packages/gcc.scm (javac.in): New variable.
(gcj-4.8): Use it as an input.
Diffstat (limited to 'gnu/packages/javac.in')
-rw-r--r-- | gnu/packages/javac.in | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/gnu/packages/javac.in b/gnu/packages/javac.in deleted file mode 100644 index adb4dc1f6c..0000000000 --- a/gnu/packages/javac.in +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/perl -w - -# Taken from Gentoo: -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-java/gcj-jdk/files/javac.in - -use strict; -use constant NO_DUP_ARGS => qw(-source -target -d -encoding); -use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:); - -my $ECJ_WARNINGS="-nowarn"; - -my ( @bcoption, @source15, @target15, @cp ); -push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@' - unless grep {$_ eq '-bootclasspath'} @ARGV; -push @source15, '-source', '1.5' - unless grep {$_ eq '-source'} @ARGV; -push @target15, '-target', '1.5' - unless grep {$_ eq '-target'} @ARGV; -push @cp, '-cp', '.' - unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH}; -my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp); - -# Work around ecj's inability to handle duplicate command-line -# options and unknown javac options. -sub gen_ecj_opts -{ - my @new_args = @{$_[0]}; - - for my $opt (NO_DUP_ARGS) - { - my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; - if (@indices > 1) { - shift @indices; # keep last instance only - splice @new_args, $_, 2 for @indices; - } - } - - for my $opt (STRIP_ARGS) - { - my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; - splice @new_args, $_, 1 for @indices; - } - - return \@new_args; -} - -sub split_vm_args -{ - my @new_args = @{$_[0]}; - - my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args; - my @javac_args = grep $_ !~ /^-J/, @new_args; - - return (\@vm_args, \@javac_args); -} - -my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV )); -my @CLASSPATH = ('@ECJ_JAR@'); -push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; -$ENV{"CLASSPATH"} = join ':', @CLASSPATH; -exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; |