[svn:parrot] r43765 - in branches/nativecall_pir_build: config/gen/makefiles src/bootstrap/string tools/build

[plobsing at svn.parrot.org]

Author: plobsing
Date: Sun Feb  7 23:06:37 2010
New Revision: 43765
URL: https://trac.parrot.org/parrot/changeset/43765

Log:
remove miniparrot dependency on src/nci.str (and src/nci.c)

Added:
   branches/nativecall_pir_build/src/bootstrap/string/
Modified:
   branches/nativecall_pir_build/config/gen/makefiles/root.in
   branches/nativecall_pir_build/tools/build/c2str.pl

Modified: branches/nativecall_pir_build/config/gen/makefiles/root.in
==============================================================================
--- branches/nativecall_pir_build/config/gen/makefiles/root.in	Sun Feb  7 22:10:56 2010	(r43764)
+++ branches/nativecall_pir_build/config/gen/makefiles/root.in	Sun Feb  7 23:06:37 2010	(r43765)
@@ -431,8 +431,6 @@
     src/io/socket_win32$(O)
 
 INTERP_O_FILES = \
-    src/string/api$(O) \
-    \
     src/ops/core_ops$(O) \
     src/ops/core_ops_switch$(O) \
     \
@@ -512,15 +510,17 @@
     $(ENCODING_O_FILES) \
     $(IMCC_O_FILES)
 
-STAGE1_O_FILES = \
+STAGE0_O_FILES = \
     $(COMMON_O_FILES) \
-    src/bootstrap/nci$(O)
+    src/bootstrap/nci$(O) \
+    src/bootstrap/string/api$(O)
 
-STAGE2_O_FILES = \
+STAGE1_O_FILES = \
     $(COMMON_O_FILES) \
-    src/nci$(O)
+    src/nci$(O) \
+    src/string/api$(O)
 
-O_FILES = $(STAGE2_O_FILES)
+O_FILES = $(STAGE1_O_FILES)
 
 ###############################################################################
 #
@@ -646,7 +646,7 @@
 .c.str : # suffix rule (limited support)
 	$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl $< > $@
 
-STR_FILES = \
+COMMON_STR_FILES = \
     src/debug.str \
     src/dynext.str \
     src/events.str \
@@ -664,7 +664,6 @@
     src/library.str \
     src/multidispatch.str \
     src/frame_builder.str \
-    src/nci.str \
     src/packfile.str \
     src/pmc.str \
     src/pmc_freeze.str \
@@ -680,9 +679,21 @@
     \
     $(CLASS_STR_FILES)
 
-src/string/private_cstring.h : $(STR_FILES) $(BUILD_TOOLS_DIR)/c2str.pl
+STAGE0_STR_FILES = \
+    $(COMMON_STR_FILES) \
+    src/bootstrap/nci.str
+
+STAGE1_STR_FILES = \
+    $(COMMON_STR_FILES) \
+    src/nci.str
+
+src/string/private_cstring.h : $(STAGE1_STR_FILES) $(BUILD_TOOLS_DIR)/c2str.pl
 	$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl --all
 
+src/bootstrap/string/private_cstring.h : $(STAGE0_STR_FILES) $(BUILD_TOOLS_DIR)/c2str.pl
+	$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl --all \
+	    --string-private-h src/bootstrap/string/private_cstring.h
+
 H2INC = $(BUILD_TOOLS_DIR)/h2inc.pl
 
 # classes PMC build utils and rules
@@ -845,10 +856,10 @@
 	$(PARROT) -o parrot_config.pbc tools/util/parrot-config.pir
 	$(PARROT) pbc_to_exe.pbc parrot_config.pbc
 
-$(MINIPARROT) : src/main$(O) $(GEN_HEADERS) $(STAGE1_O_FILES) \
+$(MINIPARROT) : src/main$(O) $(GEN_HEADERS) $(STAGE0_O_FILES) \
     lib/Parrot/OpLib/core.pm src/null_config$(O)
 	$(LINK) @ld_out@$@ src/main$(O) src/null_config$(O) \
-	$(STAGE1_O_FILES) $(ICU_SHARED) $(C_LIBS) $(LINKFLAGS)
+	$(STAGE0_O_FILES) $(ICU_SHARED) $(C_LIBS) $(LINKFLAGS)
 #IF(win32):	if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
 
 $(INSTALLABLEPARROT) : src/main$(O) $(GEN_HEADERS) $(LIBPARROT) \
@@ -1233,6 +1244,12 @@
 src/string/api$(O) : $(PARROT_H_HEADERS) src/string/api.str \
         src/string/private_cstring.h
 
+src/bootstrap/string/api.c : src/string/api.c
+	$(CP) $< $@
+
+src/bootstrap/string/api$(O) : $(PARROT_H_HEADERS) src/bootstrap/string/api.str \
+	src/bootstrap/string/private_cstring.h
+
 src/string/primitives$(O) : $(PARROT_H_HEADERS)
 
 src/longopt$(O) : $(PARROT_H_HEADERS)

Modified: branches/nativecall_pir_build/tools/build/c2str.pl
==============================================================================
--- branches/nativecall_pir_build/tools/build/c2str.pl	Sun Feb  7 22:10:56 2010	(r43764)
+++ branches/nativecall_pir_build/tools/build/c2str.pl	Sun Feb  7 23:06:37 2010	(r43765)
@@ -25,6 +25,14 @@
 my $outfile          = 'all_cstring.str';
 my $string_private_h = 'src/string/private_cstring.h';
 
+my ( $do_all, $do_init, $file );
+Getopt::Long::GetOptions(
+    "all"                => \$do_all,
+    "init"               => \$do_init,
+    "outfile=s"          => \$outfile,
+    "string-private-h=s" => \$string_private_h,
+);
+
 # add read/write permissions even if we don't read/write the file
 # for example, Solaris requires write permissions for exclusive locks
 my $ALL = IO::File->new($outfile, O_CREAT | O_RDWR)
@@ -34,12 +42,6 @@
 
 $ALL->seek(2, 0); # in case its been appended to while we waited for the lock
 
-my ( $result, $do_all, $do_init, $file );
-$result = Getopt::Long::GetOptions(
-    "all"  => \$do_all,
-    "init" => \$do_init,
-);
-
 $do_all and do {
     read_all();
     create_c_include();