gmane.comp.sysutils.bsdbuild.scm

BSDBuild-SVN | 3 Jun 18:51

BSDBuild: r803 - trunk

Author: vedge
Date: 2009-06-03 13:51:59 -0300 (Wed, 03 Jun 2009)
New Revision: 803

Modified:
   trunk/configure
   trunk/configure.in
Log:
2.5

Modified: trunk/configure
===================================================================
--- trunk/configure	2009-06-03 09:59:32 UTC (rev 802)
+++ trunk/configure	2009-06-03 16:51:59 UTC (rev 803)
@@ -8,7 +8,7 @@
 #
 #     $ cat configure.in | mkconfigure > configure
 #
-# Copyright (c) 2001-2008 Hypertriton, Inc. <http://hypertriton.com/>
+# Copyright (c) 2001-2009 Hypertriton, Inc. <http://hypertriton.com/>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -144,7 +144,7 @@
 fi

 if [ "${srcdir}" != "" ]; then
-	echo "concurrent build (source in ${srcdir})"
+	echo "* Separate build (source in ${srcdir})"
 	SRC=${srcdir}

(Continue reading)

BSDBuild-SVN | 3 Jun 11:57

BSDBuild: r802 - in trunk: . BSDBuild

Author: vedge
Date: 2009-06-03 06:59:32 -0300 (Wed, 03 Jun 2009)
New Revision: 802

Modified:
   trunk/BSDBuild/Core.pm
   trunk/build.proj.mk
   trunk/mkconfigure.pl
Log:
add explicit --output-lua argument to mkconfigure

Modified: trunk/BSDBuild/Core.pm
===================================================================
--- trunk/BSDBuild/Core.pm	2009-06-03 09:44:33 UTC (rev 801)
+++ trunk/BSDBuild/Core.pm	2009-06-03 09:59:32 UTC (rev 802)
@@ -23,6 +23,7 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE..

+our $OutputLUA = 'configure.lua';
 our $LUA = undef;
 our $EmulOS = undef;
 our $EmulOSRel = undef;
@@ -278,7 +279,7 @@
 	foreach my $var (@_) {
 		print << "EOF";
 echo "$var=\$$var" >>Makefile.config
-echo "mdefs[\\"$var\\"] = \\"\$$var\\"" >>configure.lua
+echo "mdefs[\\"$var\\"] = \\"\$$var\\"" >>$OutputLUA
 EOF

(Continue reading)

BSDBuild-SVN | 3 Jun 11:44

BSDBuild: r801 - trunk

Author: vedge
Date: 2009-06-03 06:44:33 -0300 (Wed, 03 Jun 2009)
New Revision: 801

Modified:
   trunk/build.proj.mk
Log:
use ${TOP}/configure.lua instead of ${PROJINCLUDES}

Modified: trunk/build.proj.mk
===================================================================
--- trunk/build.proj.mk	2009-06-03 02:41:39 UTC (rev 800)
+++ trunk/build.proj.mk	2009-06-03 09:44:33 UTC (rev 801)
@@ -52,14 +52,14 @@
 		windows:vs2005:: \
 		windows:vs2008::

-CLEANFILES+=	${PREMAKEOUT} ${PROJINCLUDES}
+CLEANFILES+=	${PREMAKEOUT}

 proj-package:
 	@if [ "${PROJECT}" = "" ]; then \
 	    echo "cat Makefile | ${MKPROJFILES} > ${PREMAKEOUT}"; \
 	    cat Makefile | \
 	        env PROJTARGET="${PROJTARGET}" PROJOS="${PROJOS}" \
-		PROJFLAVOR="" PROJINCLUDES="${PROJINCLUDES}" \
+		PROJFLAVOR="" PROJINCLUDES="${TOP}/configure.lua" \
 	        ${MKPROJFILES} > ${PREMAKEOUT}; \
 	fi

(Continue reading)

BSDBuild-SVN | 3 Jun 04:37

BSDBuild: r800 - trunk

Author: vedge
Date: 2009-06-02 23:41:39 -0300 (Tue, 02 Jun 2009)
New Revision: 800

Modified:
   trunk/build.proj.mk
Log:
don't clear Makefile.config after processing a package.

Modified: trunk/build.proj.mk
===================================================================
--- trunk/build.proj.mk	2009-06-03 02:16:24 UTC (rev 799)
+++ trunk/build.proj.mk	2009-06-03 02:41:39 UTC (rev 800)
@@ -118,7 +118,6 @@
 		if [ "${PROJNOCLEAN}" = "no" ]; then \
 			echo "rm -f configure.tmp config.log"; \
 			rm -f configure.tmp config.log; \
-			echo >Makefile.config; \
 		fi; \
 		\
 	        echo "cat Makefile | ${MKPROJFILES} > ${PREMAKEOUT}"; \
@@ -163,14 +162,6 @@
 			rm -f .projfiles.out ${PROJINCLUDES}; \
 		fi; \
 	done
-	@if [ "${PROJNOCLEAN}" = "no" ]; then \
-		echo "${MAKE} proj-clean"; \
-		${MAKE} proj-clean; \
-	fi
 	@echo "* Done"

(Continue reading)

BSDBuild-SVN | 3 Jun 04:12

BSDBuild: r799 - trunk

Author: vedge
Date: 2009-06-02 23:16:24 -0300 (Tue, 02 Jun 2009)
New Revision: 799

Modified:
   trunk/mkprojfiles.pl
Log:
scan modules for LINK prior to processing packages.

Modified: trunk/mkprojfiles.pl
===================================================================
--- trunk/mkprojfiles.pl	2009-06-03 01:38:20 UTC (rev 798)
+++ trunk/mkprojfiles.pl	2009-06-03 02:16:24 UTC (rev 799)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -I%PREFIX%/share/bsdbuild
 #
-# Copyright (c) 2008 Hypertriton, Inc. <http://hypertriton.com/>
+# Copyright (c) 2008-2009 Hypertriton, Inc. <http://hypertriton.com/>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -243,13 +243,23 @@
 	print STDERR "$Error\n";
 	exit(1);
 }
-if (exists($V{'PROJECT'}) && $V{'PROJECT'}) {
-	DoProject();
-}

+print << 'EOF';

(Continue reading)

BSDBuild-SVN | 3 Jun 03:38

BSDBuild: r798 - trunk

Author: vedge
Date: 2009-06-02 22:38:20 -0300 (Tue, 02 Jun 2009)
New Revision: 798

Modified:
   trunk/mkprojfiles.pl
Log:
remove debug output

Modified: trunk/mkprojfiles.pl
===================================================================
--- trunk/mkprojfiles.pl	2009-06-02 17:16:44 UTC (rev 797)
+++ trunk/mkprojfiles.pl	2009-06-03 01:38:20 UTC (rev 798)
@@ -218,7 +218,6 @@
 		if (/^\s*(\w+)\s*=\s*"(.+)"$/ ||
 		    /^\s*(\w+)\s*=\s*(.+)$/) {
 			$V{$1} = $2;
-			print STDERR "$1 => \"$V{$1}\"\n";
 		} elsif (/^\s*(\w+)\s*\+=\s*"(.+)"$/ ||
 		         /^\s*(\w+)\s*\+=\s*(.+)$/) {
 			if (exists($V{$1}) && $V{$1} ne '') {
@@ -226,7 +225,6 @@
 			} else {
 				$V{$1} = $2;
 			}
-			print STDERR "$1 => \"$V{$1}\" (app)\n";
 		}

 		if (/^\s*include\s+(.+)$/) {

(Continue reading)

BSDBuild-SVN | 2 Jun 19:14

BSDBuild: r796 - trunk

Author: vedge
Date: 2009-06-02 14:16:04 -0300 (Tue, 02 Jun 2009)
New Revision: 796

Modified:
   trunk/mkprojfiles.pl
Log:
parse the makefiles and makefile includes in a standard way, handling
variable substitutions and concatenations like make would.

Modified: trunk/mkprojfiles.pl
===================================================================
--- trunk/mkprojfiles.pl	2009-06-02 11:47:18 UTC (rev 795)
+++ trunk/mkprojfiles.pl	2009-06-02 17:16:04 UTC (rev 796)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I%PREFIX%/share/bsdbuild
+#!/usr/bin/perl -I/usr/local/share/bsdbuild
 #
 # Copyright (c) 2008 Hypertriton, Inc. <http://hypertriton.com/>
 # All rights reserved.
@@ -28,8 +28,7 @@
 # Read a BSDBuild Makefile on standard input and output the Premake script
 # which will be used by <build.proj.mk> to generate IDE project files.
 # 
-# Premake project information is obtained from assignments to the standard
-# BSDBuild variables:
+# The following BSDBuild variables are recognized:
 #
 #	SUBDIR		-> Recurse using Premake dopackage()
 #	PROJECT		-> Premake project name

(Continue reading)

BSDBuild-SVN | 2 Jun 13:46

BSDBuild: r795 - trunk/BSDBuild

Author: vedge
Date: 2009-06-02 08:47:18 -0300 (Tue, 02 Jun 2009)
New Revision: 795

Modified:
   trunk/BSDBuild/gettimeofday.pm
Log:
+ Emul()

Modified: trunk/BSDBuild/gettimeofday.pm
===================================================================
--- trunk/BSDBuild/gettimeofday.pm	2009-06-02 10:36:34 UTC (rev 794)
+++ trunk/BSDBuild/gettimeofday.pm	2009-06-02 11:47:18 UTC (rev 795)
@@ -39,10 +39,24 @@
 EOF
 }

+sub Emul
+{
+	my ($os, $osrel, $machine) = @_;
+
+	if ($os eq 'linux' || $os eq 'darwin' || $os =~ /^(open|net|free)bsd/) {
+		MkDefine('HAVE_GETTIMEOFDAY', 'yes');
+		MkSaveDefine('HAVE_GETTIMEOFDAY');
+	} else {
+		MkSaveUndef('HAVE_GETTIMEOFDAY');
+	}
+	return (1);
+}
+

(Continue reading)

BSDBuild-SVN | 2 Jun 12:33

BSDBuild: r794 - trunk/BSDBuild

Author: vedge
Date: 2009-06-02 07:36:34 -0300 (Tue, 02 Jun 2009)
New Revision: 794

Modified:
   trunk/BSDBuild/cc.pm
Log:
add missing HAVE_FOO_ATTRIBUTE to Emul()

Modified: trunk/BSDBuild/cc.pm
===================================================================
--- trunk/BSDBuild/cc.pm	2009-06-02 10:30:49 UTC (rev 793)
+++ trunk/BSDBuild/cc.pm	2009-06-02 10:36:34 UTC (rev 794)
@@ -301,11 +301,16 @@
 	MkDefine('HAVE_IEEE754', 'yes');
 	MkSaveDefine('HAVE_IEEE754');

+	MkSaveUndef('HAVE_ALIGNED_ATTRIBUTE');
 	MkSaveUndef('HAVE_BOUNDED_ATTRIBUTE');
+	MkSaveUndef('HAVE_CONST_ATTRIBUTE');
+	MkSaveUndef('HAVE_DEPRECATED_ATTRIBUTE');
 	MkSaveUndef('HAVE_FORMAT_ATTRIBUTE');
 	MkSaveUndef('HAVE_NONNULL_ATTRIBUTE');
-	MkSaveUndef('HAVE_ALIGNED_ATTRIBUTE');
+	MkSaveUndef('HAVE_NORETURN_ATTRIBUTE');
 	MkSaveUndef('HAVE_PACKED_ATTRIBUTE');
+	MkSaveUndef('HAVE_PURE_ATTRIBUTE');
+	MkSaveUndef('HAVE_WARN_UNUSED_RESULT_ATTRIBUTE');

 	MkSaveUndef('HAVE_LONG_DOUBLE');

(Continue reading)

BSDBuild-SVN | 2 Jun 12:29

BSDBuild: r793 - trunk

Author: vedge
Date: 2009-06-02 07:30:49 -0300 (Tue, 02 Jun 2009)
New Revision: 793

Modified:
   trunk/mkprojfiles.pl
Log:
SUBDIR_FOO should be case-sensitive

Modified: trunk/mkprojfiles.pl
===================================================================
--- trunk/mkprojfiles.pl	2009-06-02 07:25:24 UTC (rev 792)
+++ trunk/mkprojfiles.pl	2009-06-02 10:30:49 UTC (rev 793)
@@ -101,8 +101,7 @@
 				next;
 			}
 			if ($subdir =~ /^\$\{SUBDIR_(\w+)\}$/) {
-				my $subdiropt = lc($1);
-				print "dopackage(\"$subdiropt\")\n";
+				print "dopackage(\"$1\")\n";
 			} else {
 				print "dopackage(\"$subdir\")\n";
 			}

BSDBuild-SVN | 2 Jun 09:21

BSDBuild: r792 - trunk

Author: vedge
Date: 2009-06-02 04:25:24 -0300 (Tue, 02 Jun 2009)
New Revision: 792

Modified:
   trunk/mkprojfiles.pl
Log:
recognize optional ${SUBDIR_FOO} directories in dopackage() substitution.

Modified: trunk/mkprojfiles.pl
===================================================================
--- trunk/mkprojfiles.pl	2009-05-17 04:53:53 UTC (rev 791)
+++ trunk/mkprojfiles.pl	2009-06-02 07:25:24 UTC (rev 792)
@@ -100,7 +100,12 @@
 			if (grep { $_ eq $subdir } @subdirConfig) {
 				next;
 			}
-			print "dopackage(\"$subdir\")\n";
+			if ($subdir =~ /^\$\{SUBDIR_(\w+)\}$/) {
+				my $subdiropt = lc($1);
+				print "dopackage(\"$subdiropt\")\n";
+			} else {
+				print "dopackage(\"$subdir\")\n";
+			}
 		}
 	}
 }

Advertisement

Project Web Page

Notices of SVN commits on the BSDBuild source repository

Search Archive

Page

1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11

July 2009

Language

Change language

Options

Current view: Threads only / Showing only 20 lines / Not hiding cited text.
Change to All messages, whole messages, or hide cited text.

Post a message
NNTP Newsgroup
Classic Gmane web interface
XML

XML

RSS Feed
List Information

About Gmane

Recent entries

BSDBuild: r803 - trunk (3 Jun 18:51)
BSDBuild: r802 - in trunk: . BSDBuild (3 Jun 11:57)
BSDBuild: r801 - trunk (3 Jun 11:44)
BSDBuild: r800 - trunk (3 Jun 04:37)
BSDBuild: r799 - trunk (3 Jun 04:12)
BSDBuild: r798 - trunk (3 Jun 03:38)
BSDBuild: r796 - trunk (2 Jun 19:14)
BSDBuild: r795 - trunk/BSDBuild (2 Jun 13:46)
BSDBuild: r794 - trunk/BSDBuild (2 Jun 12:33)
BSDBuild: r793 - trunk (2 Jun 12:29)
BSDBuild: r792 - trunk (2 Jun 09:21)
BSDBuild: r791 - trunk/BSDBuild (17 May 06:52)
BSDBuild: r790 - trunk (21 Apr 05:44)
BSDBuild: r789 - trunk (21 Apr 05:31)
BSDBuild: r788 - in trunk: BSDBuild libtool (21 Apr 05:14)
BSDBuild: r787 - trunk/man (21 Apr 05:14)
BSDBuild: r786 - trunk (21 Apr 05:14)
BSDBuild: r785 - trunk (20 Apr 13:56)
BSDBuild: r784 - trunk/BSDBuild (20 Apr 10:40)
BSDBuild: r783 - trunk/BSDBuild (20 Apr 07:41)
BSDBuild: r782 - trunk/BSDBuild (18 Apr 16:56)

Archives

103	January 1970

Design

Zawodny | Right Menu | Left Menu

Your Own Design

Paste the URL of your CSS below. Download CSS template