Author: allison
Date: Thu Jan 1 23:42:35 2009
New Revision: 34794
Modified:
trunk/config/gen/makefiles/dynoplibs_pl.in
trunk/config/gen/makefiles/dynpmc.in
trunk/config/gen/makefiles/dynpmc_pl.in
trunk/config/gen/makefiles/editor.in
trunk/config/gen/makefiles/ext.in
Log:
[pdd30install] Some makefile changes to use the new conditional line syntax for
macro files. Extracted from pdd30install branch (Reini Urban).
Modified: trunk/config/gen/makefiles/dynoplibs_pl.in
==============================================================================
--- trunk/config/gen/makefiles/dynoplibs_pl.in (original)
+++ trunk/config/gen/makefiles/dynoplibs_pl.in Thu Jan 1 23:42:35 2009
@@ -32,7 +32,7 @@
our $CFLAGS = q...@ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@
@cg_flag@ @gc_f...@];
our $LIBPARROT = q[];
-#CONDITIONED_LINE(parrot_is_shared):$LIBPARROT = q...@libparrot_ldflags@];
+#IF(parrot_is_shared):$LIBPARROT = q...@libparrot_ldflags@];
# Here comes some stuff for Win32.
our $PATHQUOTE = q[];
@@ -46,15 +46,15 @@
}
# OPS2C Config
-our $OPS2C = "$PERL -I $PATHQUOTE" .
+our $OPS2C = "$PERL -I $PATHQUOTE" .
q...@build_dir@@sl...@lib] .
"$PATHQUOTE $PATHQUOTE" .
q...@build_dir@@sl...@tools@sl...@build@[email protected]] .
$PATHQUOTE;
our %cores = (
C => q[],
-#CONDITIONED_LINE(cg_flag): CGP => '_cgp',
-#CONDITIONED_LINE(cg_flag): CGoto => '_cg',
+#IF(cg_flag): CGP => '_cgp',
+#IF(cg_flag): CGoto => '_cg',
CSwitch => '_switch'
);
@@ -73,7 +73,7 @@
sub partial_link_cmd {
my ($target, $libs, $sources) = @_;
-
+
my $liblist;
if ($^O =~ /mswin32/i) {
# Need to put various libraries in the link line.
@@ -106,14 +106,14 @@
# Convert X.ops -> ops_X.c, ops_X_cgp.c, ops_X_cg.c and ops_X_switch.c
my $core;
generate_c($_) foreach (@oplibs);
-}
+}
elsif ($mode eq 'compile') {
# Convert X.c -> X.o for all X.c
my $core_suffix;
foreach $core_suffix (values %cores) {
compile($_ . "_ops$core_suffix") foreach (@oplibs);
}
-}
+}
elsif ($mode eq 'linklibs') {
my @objs = grep { /$O$/} @oplibs;
@oplibs = grep {!/$O$/} @oplibs;
@@ -123,7 +123,7 @@
foreach $core_suffix (values %cores) {
partial_link({}, $_ . "_ops$core_suffix", @objs) foreach (@oplibs);
}
-}
+}
elsif ($mode eq 'copy') {
# Copy *.so -> destination, where destination is the first
# argument, given as --destination=DIRECTORY
Modified: trunk/config/gen/makefiles/dynpmc.in
==============================================================================
--- trunk/config/gen/makefiles/dynpmc.in (original)
+++ trunk/config/gen/makefiles/dynpmc.in Thu Jan 1 23:42:35 2009
@@ -14,30 +14,30 @@
dynlexpad \
foo \
rotest \
-#CONDITIONED_LINE(has_gdbm): gdbmhash \
+#IF(has_gdbm): gdbmhash \
rational \
-#CONDITIONED_LINE(has_crypto): md2 \
-#CONDITIONED_LINE(has_crypto): md4 \
-#CONDITIONED_LINE(has_crypto): md5 \
-#CONDITIONED_LINE(has_crypto): ripemd160 \
-#CONDITIONED_LINE(has_crypto): sha \
-#CONDITIONED_LINE(has_crypto): sha1 \
-#CONDITIONED_LINE(has_crypto): sha256 \
-#CONDITIONED_LINE(has_crypto): sha512 \
+#IF(has_crypto): md2 \
+#IF(has_crypto): md4 \
+#IF(has_crypto): md5 \
+#IF(has_crypto): ripemd160 \
+#IF(has_crypto): sha \
+#IF(has_crypto): sha1 \
+#IF(has_crypto): sha256 \
+#IF(has_crypto): sha512 \
subproxy
BUILD = $(PERL) @build_dir@/tools/build/dynpmc.pl
# some *.pmc file are generated
GEN_PMC_DEFINITIONS = \
-#CONDITIONED_LINE(has_crypto): md2.pmc \
-#CONDITIONED_LINE(has_crypto): md4.pmc \
-#CONDITIONED_LINE(has_crypto): md5.pmc \
-#CONDITIONED_LINE(has_crypto): ripemd160.pmc \
-#CONDITIONED_LINE(has_crypto): sha.pmc \
-#CONDITIONED_LINE(has_crypto): sha1.pmc \
-#CONDITIONED_LINE(has_crypto): sha256.pmc \
-#CONDITIONED_LINE(has_crypto): sha512.pmc
+#IF(has_crypto): md2.pmc \
+#IF(has_crypto): md4.pmc \
+#IF(has_crypto): md5.pmc \
+#IF(has_crypto): ripemd160.pmc \
+#IF(has_crypto): sha.pmc \
+#IF(has_crypto): sha1.pmc \
+#IF(has_crypto): sha256.pmc \
+#IF(has_crypto): sha512.pmc
all :
@$(BUILD) generate $(PMCS)
Modified: trunk/config/gen/makefiles/dynpmc_pl.in
==============================================================================
--- trunk/config/gen/makefiles/dynpmc_pl.in (original)
+++ trunk/config/gen/makefiles/dynpmc_pl.in Thu Jan 1 23:42:35 2009
@@ -36,7 +36,7 @@
our $CFLAGS = q...@ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@
@cg_flag@ @gc_f...@];
our $LIBPARROT = q[];
-#CONDITIONED_LINE(parrot_is_shared):$LIBPARROT = q...@libparrot_ldflags@];
+#IF(parrot_is_shared):$LIBPARROT = q...@libparrot_ldflags@];
# Here comes some stuff for Win32.
our $PATHQUOTE = '';
Modified: trunk/config/gen/makefiles/editor.in
==============================================================================
--- trunk/config/gen/makefiles/editor.in (original)
+++ trunk/config/gen/makefiles/editor.in Thu Jan 1 23:42:35 2009
@@ -1,8 +1,8 @@
# $Id$
OPS_DIR = ../src/ops
-#CONDITIONED_LINE(win32):VIM_DIR = $(USERPROFILE)/vimfiles
-#INVERSE_CONDITIONED_LINE(win32):VIM_DIR = $(HOME)/.vim
+#IF(win32):VIM_DIR = $(USERPROFILE)/vimfiles
+#IF(win32):VIM_DIR = $(HOME)/.vim
VIM_FT_DIR = $(VIM_DIR)/plugin
VIM_IN_DIR = $(VIM_DIR)/indent
VIM_SYN_DIR = $(VIM_DIR)/syntax
Modified: trunk/config/gen/makefiles/ext.in
==============================================================================
--- trunk/config/gen/makefiles/ext.in (original)
+++ trunk/config/gen/makefiles/ext.in Thu Jan 1 23:42:35 2009
@@ -53,10 +53,10 @@
Parrot-Embed : Parrot-Embed.dummy
Parrot-Embed.dummy:
-#CONDITIONED_LINE(win32): - cd Parrot-Embed && $(PERL) Makefile.PL &&
nmake
-#INVERSE_CONDITIONED_LINE(win32): - cd Parrot-Embed && $(PERL)
Makefile.PL && $(MAKE)
+#IF(win32): - cd Parrot-Embed && $(PERL) Makefile.PL && nmake
+#UNLESS(win32): - cd Parrot-Embed && $(PERL) Makefile.PL && $(MAKE)
Parrot-Embed.clean:
-#CONDITIONED_LINE(win32): - cd Parrot-Embed && nmake clean
-#INVERSE_CONDITIONED_LINE(win32): - cd Parrot-Embed && $(MAKE) clean
+#IF(win32): - cd Parrot-Embed && nmake clean
+#UNLESS(win32): - cd Parrot-Embed && $(MAKE) clean
