[phc-internals] [phc commit] r1409 - in trunk: . src/codegen

[codesite-noreply at google.com]

Author: paul.biggar
Date: Wed Jul  2 06:43:03 2008
New Revision: 1409

Modified:
   trunk/Makefile.am
   trunk/Makefile.in
   trunk/src/codegen/Generate_C.cpp

Log:
Install libphc.cpp, and look for the installed version when compiling. 
If there is a version in the current directory, we use that instead 
(this allows us to change it without reinstalling or recompiling).


Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Jul  2 06:43:03 2008
@@ -44,6 +44,7 @@
 bin_SCRIPTS = src/phc_compile_plugin
 libexec_SCRIPTS = libtool
 # pkgdata_DATA = phc-1.0.xsd
+pkgdata_DATA = libphc.cpp

 src_phc_SOURCES =												\
 	3rdparty/getopt/getopt1.c								\

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Wed Jul  2 06:43:03 2008
@@ -25,6 +25,7 @@



+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -72,7 +73,8 @@
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
-	"$(DESTDIR)$(strangelibdir)" "$(DESTDIR)$(strangeparsingdir)" \
+	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(strangelibdir)" \
+	"$(DESTDIR)$(strangeparsingdir)" \
 	"$(DESTDIR)$(strangepassmanagerdir)" \
 	"$(DESTDIR)$(strangephcdir)" \
 	"$(DESTDIR)$(strangeprocessastdir)" \
@@ -388,6 +390,8 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+pkgdataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgdata_DATA)
 strangelibHEADERS_INSTALL = $(INSTALL_HEADER)
 strangeparsingHEADERS_INSTALL = $(INSTALL_HEADER)
 strangepassmanagerHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -573,6 +577,7 @@
 bin_SCRIPTS = src/phc_compile_plugin
 libexec_SCRIPTS = libtool
 # pkgdata_DATA = phc-1.0.xsd
+pkgdata_DATA = libphc.cpp
 src_phc_SOURCES = \
 	3rdparty/getopt/getopt1.c								\
 	3rdparty/getopt/getopt.c								\
@@ -2571,6 +2576,23 @@

 distclean-libtool:
 	-rm -f libtool
+install-pkgdataDATA: $(pkgdata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " 
$(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	done
+
+uninstall-pkgdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+	done
 install-strangelibHEADERS: $(strangelib_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(strangelibdir)" || $(MKDIR_P) "$(DESTDIR)$(strangelibdir)"
@@ -2990,11 +3012,11 @@
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS) \
-		config.h
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
+		$(HEADERS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir 
in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(strangelibdir)" "$(DESTDIR)$(strangeparsingdir)" "$(DESTDIR)$(strangepassmanagerdir)" "$(DESTDIR)$(strangephcdir)" "$(DESTDIR)$(strangeprocessastdir)" "$(DESTDIR)$(strangeprocesshirdir)" "$(DESTDIR)$(strangeprocessirdir)" "$(DESTDIR)$(strangeprocessmirdir)"; 
do \
+	for dir 
in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(strangelibdir)" "$(DESTDIR)$(strangeparsingdir)" "$(DESTDIR)$(strangepassmanagerdir)" "$(DESTDIR)$(strangephcdir)" "$(DESTDIR)$(strangeprocessastdir)" "$(DESTDIR)$(strangeprocesshirdir)" "$(DESTDIR)$(strangeprocessirdir)" "$(DESTDIR)$(strangeprocessmirdir)"; 
do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -3053,7 +3075,7 @@

 info-am:

-install-data-am: install-strangelibHEADERS \
+install-data-am: install-pkgdataDATA install-strangelibHEADERS \
 	install-strangeparsingHEADERS \
 	install-strangepassmanagerHEADERS install-strangephcHEADERS \
 	install-strangeprocessastHEADERS \
@@ -3100,7 +3122,8 @@

 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-libexecSCRIPTS uninstall-nobase_pkglibLTLIBRARIES \
-	uninstall-strangelibHEADERS uninstall-strangeparsingHEADERS \
+	uninstall-pkgdataDATA uninstall-strangelibHEADERS \
+	uninstall-strangeparsingHEADERS \
 	uninstall-strangepassmanagerHEADERS \
 	uninstall-strangephcHEADERS uninstall-strangeprocessastHEADERS \
 	uninstall-strangeprocesshirHEADERS \
@@ -3124,7 +3147,7 @@
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-libexecSCRIPTS \
 	install-man install-nobase_pkglibLTLIBRARIES install-pdf \
-	install-pdf-am install-ps install-ps-am \
+	install-pdf-am install-pkgdataDATA install-ps install-ps-am \
 	install-strangelibHEADERS install-strangeparsingHEADERS \
 	install-strangepassmanagerHEADERS install-strangephcHEADERS \
 	install-strangeprocessastHEADERS \
@@ -3137,7 +3160,8 @@
 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	uninstall-libexecSCRIPTS uninstall-nobase_pkglibLTLIBRARIES \
-	uninstall-strangelibHEADERS uninstall-strangeparsingHEADERS \
+	uninstall-pkgdataDATA uninstall-strangelibHEADERS \
+	uninstall-strangeparsingHEADERS \
 	uninstall-strangepassmanagerHEADERS \
 	uninstall-strangephcHEADERS uninstall-strangeprocessastHEADERS \
 	uninstall-strangeprocesshirHEADERS \

Modified: trunk/src/codegen/Generate_C.cpp
==============================================================================
--- trunk/src/codegen/Generate_C.cpp	(original)
+++ trunk/src/codegen/Generate_C.cpp	Wed Jul  2 06:43:03 2008
@@ -2440,9 +2440,16 @@
 void Generate_C::pre_php_script(PHP_script* in)
 {
 	// For now, we simply include this.
-	ifstream file ("libphc.cpp");
-	assert (file.is_open ());
+	ifstream file;
+
+	// Check the current directory first. This means we can change 
libphc.cpp without recompiling or installing.
+	file.open ("libphc.cpp");

+	// Check the installed directory.
+	if (!file.is_open())
+		file.open (DATADIR "/phc/libphc.cpp");
+
+	assert (file.is_open ());
 	while (not file.eof ())
 	{
 		string str;