Author: vedge
Date: 2008-11-01 14:00:46 -0300 (Sat, 01 Nov 2008)
New Revision: 771
Modified:
trunk/BSDBuild/Core.pm
trunk/BSDBuild/freesg_m.pm
trunk/BSDBuild/glu.pm
trunk/BSDBuild/sdl.pm
trunk/build.proj.mk
trunk/mkconfigure.pl
trunk/mkprojfiles.pl
Log:
remove the "arch" specifier from projfiles.
Modified: trunk/BSDBuild/Core.pm
===================================================================
--- trunk/BSDBuild/Core.pm 2008-11-01 16:26:39 UTC (rev 770)
+++ trunk/BSDBuild/Core.pm 2008-11-01 17:00:46 UTC (rev 771)
@@ -26,7 +26,6 @@
our $LUA = undef;
our $EmulOS = undef;
our $EmulOSRel = undef;
-our $EmulArch = undef;
our $EmulEnv = undef;
@@ -741,7 +740,7 @@
$^W = 0;
@ISA = qw(Exporter);
- @EXPORT = qw($LUA $EmulOS $EmulOSRel $EmulArch $EmulEnv %TESTS %DESCR
MkExecOutput MkExecOutputUnique MkFileOutput Which MkFail MKSave TryCompile
MkCompileC MkCompileCXX MkCompileAndRunC MkCompileAndRunCXX TryCompileFlagsC
TryCompileFlagsCXX Log MkDefine MkAppend MkIf MkElif MkElse MkEndif MkSaveMK
MkSaveDefine MkSaveUndef MkPrint MkPrintN PmComment PmDefineBool PmDefineString
PmIncludePath PmLibPath PmBuildFlag DetectHeaderC BeginTestHeaders
EndTestHeaders);
+ @EXPORT = qw($LUA $EmulOS $EmulOSRel $EmulEnv %TESTS %DESCR MkExecOutput
MkExecOutputUnique MkFileOutput Which MkFail MKSave TryCompile MkCompileC
MkCompileCXX MkCompileAndRunC MkCompileAndRunCXX TryCompileFlagsC
TryCompileFlagsCXX Log MkDefine MkAppend MkIf MkElif MkElse MkEndif MkSaveMK
MkSaveDefine MkSaveUndef MkPrint MkPrintN PmComment PmDefineBool PmDefineString
PmIncludePath PmLibPath PmBuildFlag DetectHeaderC BeginTestHeaders
EndTestHeaders);
}
;1
Modified: trunk/BSDBuild/freesg_m.pm
===================================================================
--- trunk/BSDBuild/freesg_m.pm 2008-11-01 16:26:39 UTC (rev 770)
+++ trunk/BSDBuild/freesg_m.pm 2008-11-01 17:00:46 UTC (rev 771)
@@ -79,23 +79,16 @@
} elsif ($os eq 'windows') {
MkDefine('FREESG_M_CFLAGS', '');
MkDefine('FREESG_M_LIBS', 'freesg_m');
- } elsif ($os eq 'linux' || $os =~ /^(open|net|free)bsd$/) {
+ } else {
MkDefine('FREESG_CFLAGS', '-I/usr/include/freesg -I/usr/include
'.
'-I/usr/local/include/freesg '.
'-I/usr/local/include ');
MkDefine('FREESG_LIBS', '-L/usr/local/lib -lfreesg_m');
- } else {
- goto UNAVAIL;
}
MkDefine('HAVE_FREESG_M', 'yes');
MkSaveDefine('HAVE_FREESG_M', 'FREESG_M_CFLAGS', 'FREESG_M_LIBS');
MkSaveMK('FREESG_M_CFLAGS', 'FREESG_M_LIBS');
return (1);
-UNAVAIL:
- MkDefine('HAVE_FREESG_M', 'no');
- MkSaveUndef('HAVE_FREESG_M');
- MkSaveMK('FREESG_M_CFLAGS', 'FREESG_M_LIBS');
- return (1);
}
sub Link
Modified: trunk/BSDBuild/glu.pm
===================================================================
--- trunk/BSDBuild/glu.pm 2008-11-01 16:26:39 UTC (rev 770)
+++ trunk/BSDBuild/glu.pm 2008-11-01 17:00:46 UTC (rev 771)
@@ -106,21 +106,14 @@
} elsif ($os eq 'windows') {
MkDefine('GLU_CFLAGS', '');
MkDefine('GLU_LIBS', 'glu32');
- } elsif ($os eq 'linux' || $os =~ /^(open|net|free)bsd$/) {
+ } else {
MkDefine('GLU_CFLAGS', '-I/usr/X11R6/include');
MkDefine('GLU_LIBS', '-lGLU');
- } else {
- goto UNAVAIL;
}
MkDefine('HAVE_GLU', 'yes');
MkSaveDefine('HAVE_GLU', 'GLU_CFLAGS', 'GLU_LIBS');
MkSaveMK('GLU_CFLAGS', 'GLU_LIBS');
return (1);
-UNAVAIL:
- MkDefine('HAVE_GLU', 'no');
- MkSaveUndef('HAVE_GLU');
- MkSaveMK('GLU_CFLAGS', 'GLU_LIBS');
- return (1);
}
BEGIN
Modified: trunk/BSDBuild/sdl.pm
===================================================================
--- trunk/BSDBuild/sdl.pm 2008-11-01 16:26:39 UTC (rev 770)
+++ trunk/BSDBuild/sdl.pm 2008-11-01 17:00:46 UTC (rev 771)
@@ -144,24 +144,17 @@
} elsif ($os eq 'windows') {
MkDefine('SDL_CFLAGS', '');
MkDefine('SDL_LIBS', 'SDL SDLmain');
- } elsif ($os eq 'linux' || $os =~ /^(open|net|free)bsd$/) {
+ } else {
MkDefine('SDL_CFLAGS', '-I/usr/include/SDL -I/usr/include '.
'-I/usr/local/include/SDL
-I/usr/local/include '.
'-I/usr/X11R6/include/SDL
-I/usr/X11R6/include '.
'-D_GNU_SOURCE=1 -D_REENTRANT');
MkDefine('SDL_LIBS', '-lSDL -lpthread');
- } else {
- goto UNAVAIL;
}
MkDefine('HAVE_SDL', 'yes');
MkSaveDefine('HAVE_SDL', 'SDL_CFLAGS', 'SDL_LIBS');
MkSaveMK('SDL_CFLAGS', 'SDL_LIBS');
return (1);
-UNAVAIL:
- MkDefine('HAVE_SDL', 'no');
- MkSaveUndef('HAVE_SDL');
- MkSaveMK('SDL_CFLAGS', 'SDL_LIBS');
- return (1);
}
BEGIN
Modified: trunk/build.proj.mk
===================================================================
--- trunk/build.proj.mk 2008-11-01 16:26:39 UTC (rev 770)
+++ trunk/build.proj.mk 2008-11-01 17:00:46 UTC (rev 771)
@@ -60,8 +60,7 @@
echo "cat Makefile | ${MKPROJFILES} > ${PREMAKEOUT}"; \
cat Makefile | \
env PROJTARGET="${PROJTARGET}" PROJOS="${PROJOS}" \
- PROJARCH="${PROJARCH}" PROJFLAVOR="" \
- PROJINCLUDES="${PROJINCLUDES}" \
+ PROJFLAVOR="" PROJINCLUDES="${PROJINCLUDES}" \
${MKPROJFILES} > ${PREMAKEOUT}; \
fi
@@ -72,10 +71,9 @@
fi
@for TGT in ${PROJFILES}; do \
_tgtos=`echo $$TGT |awk -F: '{print $$1}' `; \
- _tgtarch=`echo $$TGT |awk -F: '{print $$2}' `; \
- _tgtproj=`echo $$TGT |awk -F: '{print $$3}' `; \
- _tgtflav=`echo $$TGT |awk -F: '{print $$4}' `; \
- _tgtopts=`echo $$TGT |awk -F: '{print $$5}'|sed 's/,/ /g'`; \
+ _tgtproj=`echo $$TGT |awk -F: '{print $$2}' `; \
+ _tgtflav=`echo $$TGT |awk -F: '{print $$3}' `; \
+ _tgtopts=`echo $$TGT |awk -F: '{print $$4}'|sed 's/,/ /g'`; \
echo "*"; \
echo "* Target: $$_tgtos ($$_tgtproj)"; \
echo "* Target flavor: $$_tgtflav"; \
@@ -91,10 +89,10 @@
rm -fR include; \
fi; \
echo "mkconfigure --emul-env=$$_tgtproj --emul-os=$$_tgtos \
- --emul-arch=$$_tgtarch > configure.tmp"; \
+ > configure.tmp"; \
cat configure.in | \
mkconfigure --emul-env=$$_tgtproj --emul-os=$$_tgtos \
- --emul-arch=$$_tgtarch > configure.tmp; \
+ > configure.tmp; \
if [ $$? != 0 ]; then \
echo "mkconfigure failed"; \
rm -fR configure.tmp ${PROJINCLUDES}; \
@@ -109,7 +107,7 @@
fi; \
echo "${MAKE} proj-package-subdir"; \
env PROJTARGET="$$_tgtproj" PROJOS="$$_tgtos" \
- PROJARCH="$$_tgtarch" \
+ PROJINCLUDES="${PROJINCLUDES}" \
${MAKE} proj-package-subdir; \
\
if [ "${PROJCONFIGDIR}" != "" ]; then \
@@ -156,16 +154,18 @@
rm -f "${PROJDIR}/$$_tgtproj-$$_tgtos.zip"; \
if [ "${PROJPREPKG}" != "" ]; then \
echo "${MAKE} ${PROJPREPKG}"; \
- env PKG_OS=$$_tgtos PKG_ARCH=$$_tgtarch \
- PKG_IDE=$$_tgtproj ${MAKE} ${PROJPREPKG}; \
+ env PKG_OS=$$_tgtos PKG_IDE=$$_tgtproj \
+ PROJINCLUDES="${PROJINCLUDES}" \
+ ${MAKE} ${PROJPREPKG}; \
fi; \
- echo "* Creating $$_tgtproj-$$_tgtos-$$_tgtarch$$_tgtflav.zip";\
+ echo "* Creating $$_tgtproj-$$_tgtos$$_tgtflav.zip";\
cat ${PROJFILELIST} | ${ZIP} ${ZIPFLAGS} \
- ${PROJDIR}/$$_tgtproj-$$_tgtos-$$_tgtarch$$_tgtflav.zip -@;\
+ ${PROJDIR}/$$_tgtproj-$$_tgtos$$_tgtflav.zip -@;\
if [ "${PROJPOSTPKG}" != "" ]; then \
echo "${MAKE} ${PROJPOSTPKG}"; \
- env PKG_OS=$$_tgtos PKG_ARCH=$$_tgtarch \
- PKG_IDE=$$_tgtproj ${MAKE} ${PROJPOSTPKG}; \
+ env PKG_OS=$$_tgtos PKG_IDE=$$_tgtproj \
+ PROJINCLUDES="${PROJINCLUDES}" \
+ ${MAKE} ${PROJPOSTPKG}; \
fi; \
echo "* Cleaning up"; \
cat .projfiles.out | perl ${TOP}/mk/cleanfiles.pl; \
Modified: trunk/mkconfigure.pl
===================================================================
--- trunk/mkconfigure.pl 2008-11-01 16:26:39 UTC (rev 770)
+++ trunk/mkconfigure.pl 2008-11-01 17:00:46 UTC (rev 771)
@@ -451,13 +451,11 @@
GetOptions("emul-os=s" => \$EmulOS,
"emul-osrel=s" => \$EmulOSRel,
- "emul-arch=s" => \$EmulArch,
"emul-env=s" => \$EmulEnv);
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";
}
@@ -743,7 +741,7 @@
}
$c = $EMUL{$t};
@args = ($EmulOS, $EmulOSRel,
- $EmulArch);
+ '');
} else {
$c = $TESTS{$t};
unless ($c) {
Modified: trunk/mkprojfiles.pl
===================================================================
--- trunk/mkprojfiles.pl 2008-11-01 16:26:39 UTC (rev 770)
+++ trunk/mkprojfiles.pl 2008-11-01 17:00:46 UTC (rev 771)
@@ -190,7 +190,6 @@
# $EmulFoo is required by some tests.
$EmulEnv = $ENV{'PROJTARGET'};
$EmulOS = $ENV{'PROJOS'};
-$EmulArch = $ENV{'PROJARCH'};
# Map the LINK routine of every module.
$INSTALLDIR = '%PREFIX%/share/bsdbuild';
_______________________________________________
BSDBuild-Commits mailing list
[email protected]
http://mail231.csoft.net/mailman/listinfo/bsdbuild-commits
