[Gd-chatter] r11458 - trunk/fundev

[housel at gwydiondylan.org]

Author: housel
Date: Tue Sep 25 22:46:07 2007
New Revision: 11458

Modified:
   trunk/fundev/Makefile.in
   trunk/fundev/configure.ac
Log:
Job: fd
Fix and improve the autoconf-based build.

* configure.ac: Make consistent use of the build, host, and target
  platforms to determine the OD platform name and the run-time
  directory.
* Makefile.in:
  Make use of the configure.ac platform variables.
  Make building from a separate directory work correctly.
  Restore the use of fdmake.


Modified: trunk/fundev/Makefile.in
==============================================================================
--- trunk/fundev/Makefile.in	(original)
+++ trunk/fundev/Makefile.in	Tue Sep 25 22:46:07 2007
@@ -7,7 +7,9 @@
 fd_host		= @fd_host@
 fd_target	= @fd_target@
 
-rt_srcdir	= @RT_SRCDIR@
+rt_build	= @rt_build@
+rt_host		= @rt_host@
+rt_target	= @rt_target@
 
 fdmake		= @PERL@ $(srcdir)/admin/builds/fdmake.pl
 
@@ -44,8 +46,8 @@
 	mkdir Bootstrap.1/bin
 	mkdir Bootstrap.1/lib
 
-Bootstrap.1/lib/$(fd_build)-build.jam: Bootstrap.1 $(rt_srcdir)/$(fd_build)-build.jam
-	cp $(rt_srcdir)/$(fd_build)-build.jam \
+Bootstrap.1/lib/$(fd_build)-build.jam: Bootstrap.1 $(srcdir)/$(rt_build)/$(fd_build)-build.jam
+	cp $(srcdir)/$(rt_build)/$(fd_build)-build.jam \
 	   Bootstrap.1/lib/$(fd_build)-build.jam
 
 BOOTSTRAP1_REGISTRY = $(srcdir)/sources/bootstrap1-registry
@@ -102,7 +104,7 @@
 Bootstrap.2/bin/minimal-console-compiler: stage-1-bootstrap
 	@echo Building stage 2 bootstrap...
 	OPEN_DYLAN_USER_INSTALL=$(abs_builddir)/Bootstrap.2 \
-	  $(MAKE) -C $(rt_srcdir) install
+	  $(MAKE) -C $(rt_build) install
 	@OPEN_DYLAN_PLATFORM_NAME=$(fd_build) \
 	  OPEN_DYLAN_RELEASE_ROOT=$(abs_builddir)/Bootstrap.2 \
 	  OPEN_DYLAN_RELEASE_INSTALL=$(abs_builddir)/Bootstrap.2 \
@@ -128,7 +130,7 @@
 Bootstrap.3/bin/minimal-console-compiler: stage-2-bootstrap
 	@echo Building stage 3 bootstrap...
 	OPEN_DYLAN_USER_INSTALL=$(abs_builddir)/Bootstrap.3 \
-	  $(MAKE) -C $(rt_srcdir) install
+	  $(MAKE) -C $(rt_build) install
 	@OPEN_DYLAN_PLATFORM_NAME=$(fd_build) \
 	  OPEN_DYLAN_RELEASE_ROOT=$(abs_builddir)/Bootstrap.2 \
 	  OPEN_DYLAN_BUILD_LOGS=$(abs_builddir)/Bootstrap.3/logs \
@@ -164,9 +166,9 @@
 final-bootstrap: Bootstrap.final
 	@echo Building final stage bootstrap...
 	OPEN_DYLAN_USER_INSTALL=$(prefix) \
-	  $(MAKE) -C $(rt_srcdir) install
-	@$(FINAL_ENV) $(FDCOMPILE) \
-		$(FINAL_LIBRARIES)
+	  $(MAKE) -C $(rt_build) install
+	@$(FINAL_ENV) $(fdmake) --compiler="$(FDCOMPILE)" \
+		$(FINAL_LIBRARIES) --library-packs="$(LIBRARY_PACKS)"
 
 install: all
 

Modified: trunk/fundev/configure.ac
==============================================================================
--- trunk/fundev/configure.ac	(original)
+++ trunk/fundev/configure.ac	Tue Sep 25 22:46:07 2007
@@ -1,4 +1,4 @@
-AC_INIT([Open Dylan], [1.0 beta 1])
+AC_INIT([Open Dylan], [1.0 beta 5])
 AC_PREREQ(2.50)
 
 #---------------------
@@ -9,32 +9,29 @@
 
 AC_DEFUN(FD_PLATFORM,[
 case $1 in
-i*86-*-linux*) $2=x86-linux ;;
-i*86-*-freebsd*) $2=x86-bsd ;;
-i*86-*-darwin*) $2=x86-darwin ;;
-powerpc-*-darwin*) $2=ppc-darwin ;;
-powerpc-*-linux-gnu*) $2=ppc-linux ;;
-powerpc-apple-darwin*) $2=ppc-darwin ;;
+i*86-*-linux*) $2=x86-linux; $3=sources/lib/run-time/pentium-linux ;;
+i*86-*-freebsd*) $2=x86-freebsd; $3=sources/lib/run-time/pentium-freebsd ;;
+i*86-*-darwin*) $2=x86-darwin; $3=sources/dfmc/c-run-time ;;
+powerpc-*-darwin*) $2=ppc-darwin; $3=sources/dfmc/c-run-time ;;
+powerpc-*-linux-gnu*) $2=ppc-linux; $3=sources/dfmc/c-run-time ;;
+powerpc-apple-darwin*) $2=ppc-darwin; $3=sources/dfmc/c-run-time ;;
 *) AC_MSG_ERROR([The $1 platform is not supported.]) ;;
 esac])
  
 AC_CANONICAL_BUILD
-FD_PLATFORM($build,fd_build)
+FD_PLATFORM($build,fd_build,rt_build)
 AC_SUBST(fd_build)
+AC_SUBST(rt_build)
 
 AC_CANONICAL_HOST
-FD_PLATFORM($host,fd_host)
+FD_PLATFORM($host,fd_host,rt_host)
 AC_SUBST(fd_host)
+AC_SUBST(rt_host)
 
 AC_CANONICAL_TARGET
-FD_PLATFORM($target,fd_target)
+FD_PLATFORM($target,fd_target,rt_target)
 AC_SUBST(fd_target)
-
-case $build in
-*-*-darwin*) RT_SRCDIR=$srcdir/sources/dfmc/c-run-time ;;
-*) RT_SRCDIR=$srcdir/sources/lib/run-time/pentium-linux ;;
-esac
-AC_SUBST(RT_SRCDIR)
+AC_SUBST(rt_target)
 
 AC_PROG_INSTALL
 AC_PROG_LN_S