Kaydet (Commit) c92f39f6 authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile

Add support for custom pack.lst

üst 3f400a53
......@@ -26,6 +26,11 @@ AC_ARG_WITH(dmake-url,
Note that dmake is under GPL license.],
[ DMAKE_URL="$withval"
])
AC_ARG_WITH(packager-list,
[ --with-packager-list=<PATH TO PACK LIST> Specify a file to drive the packaging process.
The file must follow the format explained in
instsetoo_native/util/pack.lst
],,)
AC_ARG_WITH(gnu-patch,
[ --with-gnu-patch Specify location of GNU patch on Solaris or FreeBSD
],,)
......@@ -955,6 +960,28 @@ else
AC_MSG_ERROR([$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
fi
dnl ==================================================================
dnl Checks for custom pack.lst
dnl ==================================================================
AC_MSG_CHECKING([for custom pack.lst])
CUSTOM_PACK_LIST=
USE_PACKAGER=
if test -n "$with_packager_list" ; then
if test -e $with_packager_list; then
CUSTOM_PACK_LIST=$with_packager_list
USE_PACKAGER=YES
fi
fi
if test -n "$CUSTOM_PACK_LIST"; then
AC_MSG_RESULT([$CUSTOM_PACK_LIST])
else
AC_MSG_RESULT([no])
fi
AC_SUBST(CUSTOM_PACK_LIST)
AC_SUBST(USE_PACKAGER)
dnl ===================================================================
dnl Checks for the operating system and processor.
dnl ===================================================================
......
......@@ -1703,6 +1703,8 @@ ToFile( "MKDEPENDSOLVER", "TRUE", "e" );
ToFile( "nodep", "@nodep@", "e" );
ToFile( "TARFILE_LOCATION", $TARFILE_LOCATION, "e" );
ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" );
ToFile( "CUSTOM_PACK_LIST", "@CUSTOM_PACK_LIST@", "e" );
ToFile( "USE_PACKAGER", "@USE_PACKAGER@", "e" );
#
# Writing the platform dependent constant values to file.
# (c = comment, e = environment variable, a = alias )
......
......@@ -32,9 +32,19 @@ use packager::globals;
sub check_packlist
{
my $projectdir = $ENV{'PRJ'};
$projectdir =~ s/$packager::globals::separator\s*$//;
$packager::globals::packlistname = $projectdir . $packager::globals::separator . "util" . $packager::globals::separator . $packager::globals::packlistname;
my $custompacklist = $ENV{'CUSTOM_PACK_LIST'};
if ( defined $custompacklist && length $custompacklist > 0 )
{
$packager::globals::packlistname = $custompacklist;
}
else
{
my $projectdir = $ENV{'PRJ'};
$projectdir =~ s/$packager::globals::separator\s*$//;
$packager::globals::packlistname = $projectdir . $packager::globals::separator . "util" . $packager::globals::separator . $packager::globals::packlistname;
}
print "Using pack list " . $packager::globals::packlistname . "\n";
if ( ! -f $packager::globals::packlistname )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment