Author: vedge
Date: 2008-10-23 13:02:26 -0300 (Thu, 23 Oct 2008)
New Revision: 753
Modified:
trunk/build.proj.mk
trunk/mkconfigure.pl
trunk/mkprojfiles.pl
Log:
- proj: pass --emul-env to mkconfigure.
- for vc2005, substitute ${SRC} and ${BLD} for $(SolutionDir)
Modified: trunk/build.proj.mk
===================================================================
--- trunk/build.proj.mk 2008-10-23 01:20:39 UTC (rev 752)
+++ trunk/build.proj.mk 2008-10-23 16:02:26 UTC (rev 753)
@@ -57,7 +57,8 @@
if [ ! -e "$$INCL" ]; then \
echo "Missing $$INCL; generating"; \
(cd ${TOP} && cat configure.in | mkconfigure \
- --emul-os=windows --emul-arch=i386 >/dev/null); \
+ --emul-env=vs2005 --emul-os=windows \
+ --emul-arch=i386 >/dev/null); \
fi; \
done; \
cat Makefile | ${MKPROJFILES} "" ${PROJINCLUDES} > ${PREMAKEOUT};\
@@ -77,8 +78,8 @@
echo "Target options: $$_tgtopts"; \
rm -fR config; \
cat configure.in | \
- mkconfigure --emul-os=$$_tgtos --emul-arch=$$_tgtarch > \
- configure.tmp; \
+ mkconfigure --emul-env=$$_tgtproj --emul-os=$$_tgtos \
+ --emul-arch=$$_tgtarch > configure.tmp; \
if [ $$? != 0 ]; then \
echo "mkconfigure failed"; \
rm -fR configure.tmp configure.lua; \
Modified: trunk/mkconfigure.pl
===================================================================
--- trunk/mkconfigure.pl 2008-10-23 01:20:39 UTC (rev 752)
+++ trunk/mkconfigure.pl 2008-10-23 16:02:26 UTC (rev 753)
@@ -29,6 +29,7 @@
our $EmulOS = undef;
our $EmulOSRel = undef;
our $EmulArch = undef;
+our $EmulEnv = undef;
sub mdefine
{
@@ -76,8 +77,13 @@
MkSaveMK('CFLAGS');
MkSaveMK('CXXFLAGS');
- $dir =~ s/\$SRC/\./g;
- $dir =~ s/\$BLD/\./g;
+ if ($EmulEnv eq 'vs2005') {
+ $dir =~ s/\$SRC/\$\(SolutionDir\)/g;
+ $dir =~ s/\$BLD/\$\(SolutionDir\)/g;
+ } else {
+ $dir =~ s/\$SRC/\.\./g;
+ $dir =~ s/\$BLD/\.\./g;
+ }
PmIncludePath($dir);
}
@@ -446,10 +452,14 @@
GetOptions("emul-os=s" => \$EmulOS,
"emul-osrel=s" => \$EmulOSRel,
- "emul-arch=s" => \$EmulArch);
+ "emul-arch=s" => \$EmulArch,
+ "emul-env=s" => \$EmulEnv);
- if ($EmulOS) {
- print STDERR "Emulating: $EmulOS $EmulOSRel $EmulArch\n";
+ if ($EmulOS || $EmulEnv) {
+ print STDERR "Emulating OS: $EmulOS\n";
+ print STDERR "Emulating OS Release: \"$EmulOSRel\"\n";
+ print STDERR "Emulating Architecture: \"$EmulArch\"\n";
+ print STDERR "Emulating Environment: \"$EmulEnv\"\n";
}
my %done = ();
@@ -728,8 +738,8 @@
if ($EmulOS) {
unless (exists($EMUL{$t}) &&
defined($EMUL{$t})) {
- print STDERR
- "Ignoring: $t\n";
+# print STDERR
+# "Ignoring: $t\n";
next DIRECTIVE;
}
$c = $EMUL{$t};
Modified: trunk/mkprojfiles.pl
===================================================================
--- trunk/mkprojfiles.pl 2008-10-23 01:20:39 UTC (rev 752)
+++ trunk/mkprojfiles.pl 2008-10-23 16:02:26 UTC (rev 753)
@@ -97,7 +97,7 @@
if (-e $incl) {
print "dofile(\"$incl\")\n";
} else {
- print STDERR "Ignoring include: $incl: $!\n";
+# print STDERR "Ignoring include: $incl: $!\n";
}
}
}
@@ -137,7 +137,7 @@
# }
#}
if (!$handled) {
- print STDERR "Ignoring CFLAGS: $cflag\n";
+# print STDERR "Ignoring CFLAGS: $cflag\n";
}
}
}
@@ -152,7 +152,7 @@
# }
#}
if (!$handled) {
- print STDERR "Ignoring LIBS: $lib\n";
+# print STDERR "Ignoring LIBS: $lib\n";
}
}
}
_______________________________________________
BSDBuild-Commits mailing list
[email protected]
http://mail231.csoft.net/mailman/listinfo/bsdbuild-commits
