mirror of https://github.com/CGAL/cgal
More directories are unzippped (stlport, scripts and developer_scripts)
Makefiles are patched ($(OBJ_EXT) instead of .o)
This commit is contained in:
parent
278767e9a0
commit
b8a0bd4d4f
|
|
@ -61,14 +61,15 @@ sub unzip_files($@)
|
|||
my $package = shift;
|
||||
my ($ITEM, @zip_contents,@to_unzip,$zipped_file);
|
||||
@zip_contents = `unzip -l $package`;
|
||||
# remove the first 2 and last 2 lines generated by unzip -l.
|
||||
# remove the first 3 and last 2 lines generated by unzip -l.
|
||||
shift @zip_contents;
|
||||
shift @zip_contents;
|
||||
shift @zip_contents;
|
||||
pop @zip_contents;
|
||||
pop @zip_contents;
|
||||
foreach $ITEM (@_) {
|
||||
foreach $zipped_file (@zip_contents) {
|
||||
if ( $zipped_file =~ m|(\b$ITEM.*\b)| ) {
|
||||
if ( $zipped_file =~ m|\s($ITEM.*)\s| ) {
|
||||
push(@to_unzip,($1));
|
||||
}
|
||||
}
|
||||
|
|
@ -242,7 +243,7 @@ sub install_packages()
|
|||
next;
|
||||
}
|
||||
print "$filenaam\n";
|
||||
unzip_files("$filenaam", "include", "test", "examples", "demo", "src", "version","doc_tex");
|
||||
unzip_files("$filenaam", "include", "test", "examples", "demo", "src", "version","doc_tex","stlport","developer_scripts","scripts");
|
||||
if (-f 'version') {
|
||||
open CUR_VERSION, 'version';
|
||||
while (<CUR_VERSION>) {
|
||||
|
|
@ -311,7 +312,19 @@ sub make_testscripts()
|
|||
if ( -f 'Makefile') {
|
||||
rename 'Makefile', 'makefile';
|
||||
}
|
||||
if ( ! -f 'makefile' ) {
|
||||
if ( -f 'makefile' ) {
|
||||
print "Checking makefile ...\n";
|
||||
open MAKEFILE, "makefile";
|
||||
open NEW_MAKEFILE, ">makefile.new";
|
||||
while (<MAKEFILE>) {
|
||||
s/\.o\b/\$(OBJ_EXT)/g;
|
||||
s/-g\b/\$(DEBUG_OPT)/g;
|
||||
print NEW_MAKEFILE $_;
|
||||
}
|
||||
close NEW_MAKEFILE;
|
||||
close MAKEFILE;
|
||||
rename("makefile.new","makefile");
|
||||
} else {
|
||||
print "creating makefile ...\n";
|
||||
system("$SCRIPTDIR/create_makefile", '-t');
|
||||
}
|
||||
|
|
@ -428,9 +441,9 @@ sub unlock()
|
|||
$PARENT_DIR=cwd();
|
||||
|
||||
umask(002);
|
||||
if ($PARENT_DIR ne '/private/CGAL') {
|
||||
die "$0 should only be called from directory /private/CGAL on goya.\n";
|
||||
}
|
||||
#if ($PARENT_DIR ne '/private/CGAL') {
|
||||
# die "$0 should only be called from directory /private/CGAL on goya.\n";
|
||||
#}
|
||||
check_call;
|
||||
mkdir "$VERSION",0775 or die;
|
||||
open VERSIONS, ">versions_$VERSION";
|
||||
|
|
|
|||
Loading…
Reference in New Issue