[svn:mod_parrot] r217 - in mod_parrot/trunk: . include src t t/conf t/src

Author: ianjoyce
Date: Fri Aug 26 07:26:43 2005
New Revision: 217

Added:
   mod_parrot/trunk/include/
      - copied from r216, mod_parrot/branches/reorg/include/
   mod_parrot/trunk/include/mod_parrot.h
      - copied unchanged from r216, mod_parrot/branches/reorg/include/mod_parrot.h
   mod_parrot/trunk/include/modparrot_config.h
      - copied unchanged from r216, mod_parrot/branches/reorg/include/modparrot_config.h
   mod_parrot/trunk/include/modparrot_log.h
      - copied unchanged from r216, mod_parrot/branches/reorg/include/modparrot_log.h
   mod_parrot/trunk/src/
      - copied from r216, mod_parrot/branches/reorg/src/
   mod_parrot/trunk/src/context.c
      - copied unchanged from r216, mod_parrot/branches/reorg/src/context.c
   mod_parrot/trunk/src/mod_parrot.c
      - copied unchanged from r216, mod_parrot/branches/reorg/src/mod_parrot.c
   mod_parrot/trunk/src/modparrot_config.c
      - copied unchanged from r216, mod_parrot/branches/reorg/src/modparrot_config.c
   mod_parrot/trunk/src/nci.c
      - copied unchanged from r216, mod_parrot/branches/reorg/src/nci.c
   mod_parrot/trunk/src/parrot_util.c
      - copied unchanged from r216, mod_parrot/branches/reorg/src/parrot_util.c
   mod_parrot/trunk/t/src/
      - copied from r216, mod_parrot/branches/reorg/t/src/
   mod_parrot/trunk/t/src/cc_test.pir
      - copied unchanged from r216, mod_parrot/branches/reorg/t/src/cc_test.pir
   mod_parrot/trunk/t/src/nci_sig_test.c
      - copied unchanged from r216, mod_parrot/branches/reorg/t/src/nci_sig_test.c
Removed:
   mod_parrot/trunk/cc_test.pir
   mod_parrot/trunk/context.c
   mod_parrot/trunk/mod_parrot.c
   mod_parrot/trunk/mod_parrot.h
   mod_parrot/trunk/modparrot_config.c
   mod_parrot/trunk/modparrot_config.h
   mod_parrot/trunk/modparrot_log.h
   mod_parrot/trunk/nci.c
   mod_parrot/trunk/nci_sig_test.c
   mod_parrot/trunk/parrot_util.c
Modified:
   mod_parrot/trunk/Configure.pl
   mod_parrot/trunk/Makefile.in
   mod_parrot/trunk/t/00nci.t
   mod_parrot/trunk/t/conf/extra.conf.in
Log:
merge branches/reorg into trunk

Modified: mod_parrot/trunk/Configure.pl
==============================================================================
--- mod_parrot/trunk/Configure.pl	(original)
+++ mod_parrot/trunk/Configure.pl	Fri Aug 26 07:26:43 2005
@@ -52,7 +52,7 @@ print "\n";
 
 my $defines;
 print "Determining Parrot calling conventions...";
-my $calling_conventions = `$parrot_build_dir/parrot cc_test.pir`;
+my $calling_conventions = `$parrot_build_dir/parrot t/src/cc_test.pir`;
 chomp($calling_conventions);
 if ($calling_conventions eq 'new') {
     $defines = '-DPARROT_NEW_CALL_CONV';
@@ -73,7 +73,7 @@ chomp($mpm);
 print "Configuring mod_parrot for $mpm MPM.\n";
 
 # we can't use the config verbatim -- apxs chokes on it, so we use what we can
-my $cflags = " -I$parrot_build_dir/include";
+my $cflags = " -I$parrot_build_dir/include -Iinclude";
 $cflags .= " -DMPM_IS_THREADED" if (mpm_is_threaded($mpm));
 my $ldflags = parrot_config('ldflags') . " -L$parrot_build_dir/blib/lib";
 my $libs = parrot_config('libs') . ' -lparrot';

Modified: mod_parrot/trunk/Makefile.in
==============================================================================
--- mod_parrot/trunk/Makefile.in	(original)
+++ mod_parrot/trunk/Makefile.in	Fri Aug 26 07:26:43 2005
@@ -13,8 +13,18 @@ PARROT=@PARROT@
 APACHE_INCLUDE_DIR=@APACHE_INCLUDE_DIR@
 CALLING_CONVENTIONS=@CALLING_CONVENTIONS@
 
-SOURCE_FILES=mod_parrot.c parrot_util.c modparrot_config.c nci.c context.c
+SRC_DIR = src
+TEST_SRC_DIR = t/src
+
+SOURCE_FILES= \
+	$(SRC_DIR)/mod_parrot.c \
+	$(SRC_DIR)/parrot_util.c \
+	$(SRC_DIR)/modparrot_config.c \
+	$(SRC_DIR)/nci.c \
+	$(SRC_DIR)/context.c
+
 PARROT_OBJS=$(PARROT_SOURCE)/src/parrot_config.o
+
 MPLIBS=	lib/Apache/RequestRec \
 	lib/Apache/Constants \
 	lib/APR/Table \
@@ -22,15 +32,15 @@ MPLIBS=	lib/Apache/RequestRec \
 	lib/ModParrot/HLL/pir \
 	lib/ModParrot/HLL/pugs
 
-all: gen-src mod_parrot.la
+all: gen-src src/mod_parrot.la
 
-mod_parrot.la: $(SOURCE_FILES)
+$(SRC_DIR)/mod_parrot.la: $(SOURCE_FILES)
 	$(APXS) -c $(DEFINES) $(CFLAGS) $(LDFLAGS) $(LIBS) $(SOURCE_FILES) $(PARROT_OBJS)
 
 files-clean:
-	rm -f *.o *.lo *.slo *.la core core.*
-	rm -rf .libs
-	rm -f nci_sig_test
+	rm -f $(SRC_DIR)/*.o $(SRC_DIR)/*.lo $(SRC_DIR)/*.slo $(SRC_DIR)/*.la core core.*
+	rm -rf $(SRC_DIR)/.libs
+	rm -f $(TEST_SRC_DIR)/nci_sig_test $(TEST_SRC_DIR)/*.o
 
 libraries:
 	@echo Compiling libraries:
@@ -55,19 +65,19 @@ libraries-clean:
 
 test-clean:
 	if [ -x t/TEST ]; then t/TEST -clean; fi
-	rm -f nci_sig_test t/core.* t/lib/handlers.pbc t/TEST
+	rm -f t/core.* t/lib/handlers.pbc t/TEST
 
 clean: files-clean libraries-clean gen-src-clean test-clean
 
 distclean: clean test-clean
 	rm -f Makefile Makefile.old
 
-install: mod_parrot.la
+install: $(SRC_DIR)/mod_parrot.la
 	$(APXS) -i -n parrot -a mod_parrot.la
 
-nci_sig_test: nci_sig_test.o
-	$(CC) -o $@ $(CFLAGS) nci_sig_test.c $(PARROT_OBJS) $(LDFLAGS) $(LIBS)
+$(TEST_SRC_DIR)/nci_sig_test: $(TEST_SRC_DIR)/nci_sig_test.o
+	$(CC) -o $@ $(CFLAGS) $(TEST_SRC_DIR)/nci_sig_test.c $(PARROT_OBJS) $(LDFLAGS) $(LIBS)
 
-test: mod_parrot.la libraries nci_sig_test
+test: $(SRC_DIR)/mod_parrot.la libraries $(TEST_SRC_DIR)/nci_sig_test
 	$(PARROT) -o t/lib/handlers.pbc t/lib/handlers.pir
 	$(PERL) t/TEST

Modified: mod_parrot/trunk/t/00nci.t
==============================================================================
--- mod_parrot/trunk/t/00nci.t	(original)
+++ mod_parrot/trunk/t/00nci.t	Fri Aug 26 07:26:43 2005
@@ -11,7 +11,7 @@ my @bad;
 plan tests => $#sigs+1;
 foreach my $sig (@sigs) {
     $sig =~ s/\s//g;
-    if (system('./nci_sig_test', $sig)) {
+    if (system('./t/src/nci_sig_test', $sig)) {
         push(@bad, $sig);
         fail($sig);
     }

Modified: mod_parrot/trunk/t/conf/extra.conf.in
==============================================================================
--- mod_parrot/trunk/t/conf/extra.conf.in	(original)
+++ mod_parrot/trunk/t/conf/extra.conf.in	Fri Aug 26 07:26:43 2005
@@ -1,5 +1,5 @@
 <IfModule !mod_parrot.c>
-    LoadModule parrot_module @ServerRoot@/../.libs/mod_parrot.so
+    LoadModule parrot_module @ServerRoot@/../src/.libs/mod_parrot.so
 </IfModule>
 
 ParrotInit @ServerRoot@/../lib/ModParrot/init.pbc