cvsuser 04/05/04 05:55:33
Modified: . .cvsignore
config/gen/makefiles root.in
include/parrot .cvsignore
src .cvsignore
t/pmc nci.t
Log:
[perl #29257] Build libnci.so by default
'libnci.so' is used for testing the native call interface. However I noticed
that the tests in t/pmc/nci.t were skipped, because 'libnci.so' wasn't built
by default. The attached patch adds that library to the target 'all'.
Previously 'libnci.so' was built in the 'parrot' directory. A better
location might be 'runtime/parrot/dynext'.
Courtesy of Bernhard Schmalhofer <[EMAIL PROTECTED]>
Revision Changes Path
1.33 +1 -0 parrot/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/public/parrot/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -r1.32 -r1.33
--- .cvsignore 5 Apr 2004 14:27:45 -0000 1.32
+++ .cvsignore 4 May 2004 12:55:18 -0000 1.33
@@ -1,3 +1,4 @@
+all_cstring.str
blib
config_lib.pasm
libparrot.def
1.205 +76 -66 parrot/config/gen/makefiles/root.in
Index: root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -w -r1.204 -r1.205
--- root.in 3 May 2004 06:38:52 -0000 1.204
+++ root.in 4 May 2004 12:55:21 -0000 1.205
@@ -1,4 +1,4 @@
-# $Id: root.in,v 1.204 2004/05/03 06:38:52 leo Exp $
+# $Id: root.in,v 1.205 2004/05/04 12:55:21 leo Exp $
###############################################################################
#
@@ -32,6 +32,9 @@
# Ops dir
OPS = ops
+# directory for packfile files
+PF = pf
+
# Build tools
BUILD_TOOL = build_tools
@@ -280,7 +283,7 @@
$(SRC)/vtables$(O) \
$(SRC)/mmd$(O) \
$(SRC)/extend$(O) \
- pf/pf_items$(O) \
+ $(PF)/pf_items$(O) \
$(OPS)/core_ops$(O) \
$(OPS)/core_ops_prederef$(O) \
$(OPS)/core_ops_switch$(O) \
@@ -340,18 +343,24 @@
#
###############################################################################
+# Executables
TEST_PROG = ${test_prog}${exe}
TEST_PROG_SO = ${test_prog}_so${exe}
-LIBPARROT = ${blib_lib_libparrot_a}
-LIBICUCORE = ${blib_lib_libsicuuc_a}
-LIBICUDATA = ${blib_lib_libsicudata_a}
-ALL_PARROT_LIBS = $(LIBPARROT) $(LIBICUCORE) $(LIBICUDATA) $(C_LIBS)
-# utils
DIS=disassemble${exe}
PDUMP = pdump${exe}
PINFO = pbc_info${exe}
PDB = pdb${exe}
+# libs
+LIBPARROT = ${blib_lib_libparrot_a}
+LIBICUCORE = ${blib_lib_libsicuuc_a}
+LIBICUDATA = ${blib_lib_libsicudata_a}
+ALL_PARROT_LIBS = $(LIBPARROT) $(LIBICUCORE) $(LIBICUDATA) $(C_LIBS)
+
+# dynamic extensions
+DYNEXT_DIR = runtime/parrot/dynext
+LIBNCI_SO = $(DYNEXT_DIR)/libnci$(SO)
+
###############################################################################
#
# MAKE CONFIGURATION:
@@ -374,7 +383,7 @@
#
###############################################################################
-all : flags_dummy $(TEST_PROG) library/config.fpmc docs
+all : flags_dummy $(TEST_PROG) library/config.fpmc docs $(LIBNCI_SO)
.SUFFIXES: .c .h .pmc .dump $(O) .str
@@ -420,7 +429,7 @@
@echo " parrot_utils: $(PDUMP), $(DIS), $(PINFO) and $(PDB)"
@echo " $(PDUMP): Parrot Dumper"
@echo " $(DIS): Parrot Disassembler"
- @echo " $(PINFO): Information about Parrot Bypte Code"
+ @echo " $(PINFO): Information about Parrot Byte Code"
@echo " $(PDB): Parrot Debugger"
@echo ""
@echo "Installation:"
@@ -751,7 +760,7 @@
$(SRC)/packfile$(O) : $(GENERAL_H_FILES)
-pf/pf_items$(O) : $(GENERAL_H_FILES)
+$(PF)/pf_items$(O) : $(GENERAL_H_FILES)
$(SRC)/packout$(O) : $(GENERAL_H_FILES)
@@ -1009,20 +1018,21 @@
progclean:
$(RM_F) $(O_FILES) \
$(TEST_PROG) $(PARROT_MAIN)$(O) \
- $(PDUMP) $(SRC)/pdump$(O) $(SRC)/packdump$(O) $(SRC)/pbc_info$(O)
$(PINFO) \
+ $(PDUMP) $(SRC)/pdump$(O) $(SRC)/packdump$(O) \
+ $(SRC)/pbc_info$(O) $(PINFO) \
$(PDB) $(SRC)/pdb$(O) \
- $(DIS) $(SRC)/disassemble$(O)
+ $(DIS) $(SRC)/disassemble$(O) \
+ $(DYNEXT_DIR)/$(LIBNCI_SO)
$(RM_F) $(LIBPARROT)
$(PERL) build_tools/c2str.pl --init
$(RM_F) $(STR_FILES) $(INC)/string_private_cstring.h
$(RM_F) classes/*.c classes/*.h classes/*.dump vtable.dump
testclean :
- $(RM_F) t/op/*.pasm t/op/*.pbc t/op/*.out t/op/*.o t/op/*.stabs.s \
- t/pmc/*.pasm t/pmc/*.pbc t/pmc/*.out t/pmc/*.o t/pmc/*.stabs.s \
+ $(RM_F) t/op/*.pasm t/op/*.imc t/op/*.pbc t/op/*.out t/op/*.o t/op/*.stabs.s \
+ t/pmc/*.pasm t/pmc/*.imc t/pmc/*.pbc t/pmc/*.out t/pmc/*.o t/pmc/*.stabs.s \
t/stress/*.pasm t/stress/*.pbc t/stress/*.out t/stress/*.o
t/stress/*.stabs.s \
- t/src/*_* \
- t/op/*.imc t/pmc/*.imc
+ t/src/*_*
$(MAKE_C) $(IMCC_DIR) testclean
realclean : clean
@@ -1131,11 +1141,11 @@
$(SRC)/libnci$(O): $(SRC)/nci_test.c
-libnci.so: $(SRC)/nci_test$(O)
+$(DYNEXT_DIR)/libnci.so: $(SRC)/nci_test$(O)
$(LD) $(LD_SHARED) $(LDFLAGS) \
$(LD_OUT)$@ $(SRC)/nci_test$(O)
-libnci.dll: $(SRC)/nci_test$(O)
+$(DYNEXT_DIR)/libnci.dll: $(SRC)/nci_test$(O)
$(LD) $(LD_SHARED) -def:libnci.def $(LDFLAGS) \
$(LD_OUT)$@ $(SRC)/nci_test$(O)
1.17 +1 -0 parrot/include/parrot/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/public/parrot/include/parrot/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- .cvsignore 9 Apr 2004 20:32:23 -0000 1.16
+++ .cvsignore 4 May 2004 12:55:25 -0000 1.17
@@ -4,6 +4,7 @@
vtable.h
platform.h
platform_interface.h
+string_private_cstring.h
jit_emit.h
core_pmcs.h
exec_dep.h
1.4 +2 -0 parrot/src/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/public/parrot/src/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- .cvsignore 21 Feb 2004 10:59:00 -0000 1.3
+++ .cvsignore 4 May 2004 12:55:30 -0000 1.4
@@ -5,3 +5,5 @@
nci.c
platform.c
platform_asm.s
+interpreter.str
+objects.str
1.39 +4 -12 parrot/t/pmc/nci.t
Index: nci.t
===================================================================
RCS file: /cvs/public/parrot/t/pmc/nci.t,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -w -r1.38 -r1.39
--- nci.t 4 May 2004 07:48:56 -0000 1.38
+++ nci.t 4 May 2004 12:55:33 -0000 1.39
@@ -1,6 +1,6 @@
#! perl -w
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: nci.t,v 1.38 2004/05/04 07:48:56 leo Exp $
+# $Id: nci.t,v 1.39 2004/05/04 12:55:33 leo Exp $
=head1 NAME
@@ -20,17 +20,9 @@
use Parrot::Test tests => 32;
use Parrot::Config;
-print STDERR $PConfig{jitcpuarch}, " JIT CPU\n";
-print STDERR $PConfig{so}, " SO extension\n";
-
SKIP: {
-if (-e "libnci" . $PConfig{so}) {
- if ($PConfig{jitcpuarch} eq 'i386') {
- $ENV{LD_LIBRARY_PATH} = '.';
- }
-}
-else {
- skip('Please make libnci'.$PConfig{so},
+unless ( -e "runtime/parrot/dynext/libnci" . $PConfig{so} ) {
+ skip( "Please make libnci$PConfig{so}",
Test::Builder->expected_tests());
}
