Author: bernhard
Date: Thu Oct 4 12:41:33 2007
New Revision: 21845
Removed:
trunk/languages/m4/src/eval.c
Modified:
trunk/MANIFEST
trunk/languages/m4/config/makefiles/root.in
trunk/languages/m4/t/basic/012_eval.t
trunk/languages/m4/t/builtins/001_all.t
trunk/languages/m4/t/builtins/011_eval.t
Log:
#46007: [CAGE] licensing cleanup
Remove eval.c, the only necessarily GPLed file in languages/m4.
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Thu Oct 4 12:41:33 2007
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Sep 24 13:09:40 2007 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Thu Oct 4 19:32:34 2007 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -1654,7 +1654,6 @@
languages/m4/lib/Parrot/Test/M4/Gnu.pm [m4]
languages/m4/lib/Parrot/Test/M4/PIR.pm [m4]
languages/m4/src/builtin.pir [m4]
-languages/m4/src/eval.c [m4]
languages/m4/src/freeze.pir [m4]
languages/m4/src/input.pir [m4]
languages/m4/src/m4.pir [m4]
Modified: trunk/languages/m4/config/makefiles/root.in
==============================================================================
--- trunk/languages/m4/config/makefiles/root.in (original)
+++ trunk/languages/m4/config/makefiles/root.in Thu Oct 4 12:41:33 2007
@@ -6,25 +6,6 @@
PARROT = ../../[EMAIL PROTECTED]@
PERL = @perl@
RM_RF = @rm_rf@
-O = @o@
-
-# Compile commands and flags
-CC = @cc@
-CFLAGS = @ccflags@ -I../../include
-CC_SHARED = @cc_shared@ # e.g. -fpic
-DEBUG = @cc_debug@
-WARN = @ccwarn@
-
-# Shared-library building
-LD = @ld@
-LDFLAGS = @ldflags@
-LD_SHARE_FLAGS = @ld_share_flags@ # e.g. -shared
-LIBS = @libs@
-#CONDITIONED_LINE(parrot_exe_def):LIBPARROT = @build_dir@/[EMAIL
PROTECTED]@
-#INVERSE_CONDITIONED_LINE(parrot_exe_def):LIBPARROT =
-
-# some constants
-M4_EVALUATE_SO = ../../runtime/parrot/dynext/[EMAIL PROTECTED]@
default: all
all: build
@@ -54,15 +35,11 @@
# TODO: reenable testing of GNU m4, by setting env
#CONDITIONED_LINE(has_gnu_m4): PARROT_M4_TEST_PROG='m4' $(PERL) -Ilib
-I../../lib t/harness $(USE_GNU_M4)
-build: $(M4_EVALUATE_SO) m4.pbc
+build: m4.pbc
m4.pbc: src/m4.pir
$(PARROT) -o m4.pbc src/m4.pir
-$(M4_EVALUATE_SO): src/eval.c
- $(CC) $(CFLAGS) $(CC_SHARED) $(DEBUG) $(WARN) -c src/eval.c
- $(LD) $(LD_SHARE_FLAGS) $(LDFLAGS) $(LIBS) @[EMAIL PROTECTED]@ eval$(O)
$(LIBPARROT)
-
src/m4.pir: src/builtin.pir src/freeze.pir src/input.pir src/macro.pir
src/output.pir
touch $@
@@ -83,8 +60,7 @@
"t/*/*.m4" \
"t/*/*.pir_out" \
"t/*/*.gnu_out" \
-"t/*/*.pir" \
-$(M4_EVALUATE_SO)
+"t/*/*.pir"
realclean: clean
$(RM_RF) Makefile
Modified: trunk/languages/m4/t/basic/012_eval.t
==============================================================================
--- trunk/languages/m4/t/basic/012_eval.t (original)
+++ trunk/languages/m4/t/basic/012_eval.t Thu Oct 4 12:41:33 2007
@@ -5,8 +5,8 @@
use lib qw( lib ../lib ../../lib m4/lib );
use Parrot::Config;
-use Parrot::Test tests => 1;
-use Test::More;
+use Parrot::Test;
+use Test::More skip_all => 'eval is not implemented';
my $real_out;
my $path_to_parrot = Parrot::Test::path_to_parrot();
Modified: trunk/languages/m4/t/builtins/001_all.t
==============================================================================
--- trunk/languages/m4/t/builtins/001_all.t (original)
+++ trunk/languages/m4/t/builtins/001_all.t Thu Oct 4 12:41:33 2007
@@ -33,7 +33,6 @@
line
comment
)no comment
-eval( `4')
CODE
Hello World
Hallo Welt
@@ -52,7 +51,6 @@
the first two arguments are equal
the first two arguments are not equal
no comment
-4
OUT
}
Modified: trunk/languages/m4/t/builtins/011_eval.t
==============================================================================
--- trunk/languages/m4/t/builtins/011_eval.t (original)
+++ trunk/languages/m4/t/builtins/011_eval.t Thu Oct 4 12:41:33 2007
@@ -4,7 +4,8 @@
use warnings;
use lib qw( lib ../lib ../../lib m4/lib );
-use Parrot::Test tests => 3;
+use Parrot::Test;
+use Test::More skip_all => 'eval is not implemented';
# Test the m4-Builtin function 'eval'
