Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove Library-Packs from Unix / OS X build as they are unused.

  • Loading branch information...
commit a24787bf6c68ba19d2a61aac27f157b10abed86e 1 parent 5e7c345
@waywardmonkeys waywardmonkeys authored
Showing with 4 additions and 82 deletions.
  1. +2 −10 Makefile.in
  2. +0 −1  README.rst
  3. +1 −53 admin/builds/fdmake.pl
  4. +1 −18 configure.ac
View
12 Makefile.in
@@ -22,8 +22,6 @@ DYLANCOMPILER = @DYLANCOMPILER@
library_srcdir = @with_library_source@
-LIBRARY_PACKS = @LIBRARY_PACKS@
-
.PHONY: 1-stage-bootstrap 1-stage-bootstrap-reentry \
2-stage-bootstrap 2-stage-bootstrap-reentry \
3-stage-bootstrap 3-stage-bootstrap-reentry \
@@ -193,8 +191,6 @@ BOOTSTRAP_3_ENV = \
BOOTSTRAP_3_LIBRARIES = dylan-compiler
-BOOTSTRAP_3_LIBRARY_PACKS = @LIBRARY_PACKS@
-
BOOTSTRAP_3_COMPILER = \
$(abs_builddir)/Bootstrap.2/bin/dylan-compiler $(arch_flag) -build
@@ -216,8 +212,7 @@ bootstrap-stage-3: $(abs_builddir)/Bootstrap.3
@OPEN_DYLAN_USER_INSTALL=$(abs_builddir)/Bootstrap.3 \
$(MAKE) -C $(rt_build) clean install
@$(BOOTSTRAP_3_ENV) \
- $(fdmake) --compiler="$(BOOTSTRAP_3_COMPILER)" \
- $(BOOTSTRAP_3_LIBRARIES) --library-packs="$(BOOTSTRAP_3_LIBRARY_PACKS)"
+ $(fdmake) --compiler="$(BOOTSTRAP_3_COMPILER)" $(BOOTSTRAP_3_LIBRARIES)
###
# Install stage is like stage 3, but it builds libraries and compiler in their
@@ -240,8 +235,6 @@ INSTALL_ENV = \
INSTALL_LIBRARIES = dylan-compiler dswank make-dylan-app
-INSTALL_LIBRARY_PACKS = @LIBRARY_PACKS@
-
INSTALL_COMPILER = \
$(abs_builddir)/Bootstrap.2/bin/dylan-compiler -build
@@ -260,8 +253,7 @@ install-stage: $(prefix)/sources
OPEN_DYLAN_USER_INSTALL=$(prefix) \
$(MAKE) -C $(rt_build) clean install
@$(INSTALL_ENV) \
- $(fdmake) --compiler="$(INSTALL_COMPILER)" \
- $(INSTALL_LIBRARIES) --library-packs="$(INSTALL_LIBRARY_PACKS)"
+ $(fdmake) --compiler="$(INSTALL_COMPILER)" $(INSTALL_LIBRARIES)
install: @bootstrap_target@ install-stage
View
1  README.rst
@@ -49,7 +49,6 @@ to double its value)
* Get MPS or boehm-gc, depending on your platform:
* Linux x86 or FreeBSD x86 (HARP) -> MPS
* Mac OS X and all 64 bit (C) -> boehm-gc
-* Get XML::Parser
::
View
54 admin/builds/fdmake.pl
@@ -3,7 +3,6 @@
use strict;
use File::Spec;
use Getopt::Long;
-use XML::Parser;
use Config;
my $lidfile_line;
@@ -19,14 +18,9 @@
my $verbose;
my $debugger;
my $compiler = 'dylan-compiler';
-my @library_packs;
&GetOptions('verbose' => \$verbose,
'debugger' => \$debugger,
- 'compiler=s' => \$compiler,
- 'library-pack=s' => \@library_packs,
- 'library-packs=s' => sub {
- push @library_packs, split(/\W+/, $_[1]);
- });
+ 'compiler=s' => \$compiler);
# Names of libraries we already built successfully.
my %built;
@@ -38,9 +32,6 @@
exit 1;
}
}
-foreach my $pack (@library_packs) {
- &build_library_pack($pack);
-}
exit 0;
# build_library($library)
@@ -399,49 +390,6 @@ sub invoke_tool {
}
}
-# build_library_pack($pack)
-#
-# Builds the libraries that constitute the given library pack
-#
-sub build_library_pack {
- my ($lp) = @_;
-
- my $lclp = lc($lp);
-
- my $dlpfile
- = File::Spec->catfile($user_sources, 'Library-Packs', $lp,
- "${lclp}.dlp");
-
- if(!-f $dlpfile) {
- print STDERR "fdmake: There is no library pack named $lp\n";
- exit 1;
- }
-
- my $parser = new XML::Parser(Handlers => {Start => \&handle_dlp_start});
- $parser->parsefile($dlpfile);
-}
-
-my $category = 'none';
-sub handle_dlp_start {
- my ($parser, $element, %attributes) = @_;
-
- if($element eq 'library-pack') {
- print "Building $attributes{'title'} library-pack...\n";
- } elsif($element eq 'libraries'
- || $element eq 'examples'
- || $element eq 'test-suites') {
- $category = $element;
- } elsif($element eq 'library') {
- if($category eq 'libraries') {
- if(!&build_library($attributes{'name'})) {
- print STDERR
- "fdmake: Unable to build library $attributes{'name'}\n";
- exit 1;
- }
- }
- }
-}
-
# scan_lidfile($lidfile, $dir)
#
# Scan the given LID file and scan the one or more source files named
View
19 configure.ac
@@ -51,7 +51,7 @@ test "$PERL" = no && AC_MSG_ERROR([
perl is required to build Open Dylan])
AC_SUBST(PERL)
-PERL_MODULES="File::Spec Getopt::Long XML::Parser"
+PERL_MODULES="File::Spec Getopt::Long"
for module in $PERL_MODULES; do
AC_MSG_CHECKING(for Perl module $module)
$PERL -M$module -e 'exit 0' || AC_MSG_ERROR([
@@ -115,23 +115,6 @@ AC_ARG_WITH(library-source,
[Path to Dylan contributed libraries source.]))
AC_SUBST(with_library_source)
-AC_MSG_CHECKING(for Library Packs to include)
-LIBRARY_PACKS=Core
-AC_ARG_ENABLE(network,
- AC_HELP_STRING([--disable-network],
- [Do not build the basic networking library]),
- ,LIBRARY_PACKS="$LIBRARY_PACKS Network")
-AC_ARG_ENABLE(testworks,
- AC_HELP_STRING([--enable-testworks],
- [Build the unit test framework library]),
- LIBRARY_PACKS="$LIBRARY_PACKS TestWorks")
-AC_ARG_ENABLE(dood,
- AC_HELP_STRING([--enable-dood],
- [Build the DOOD persistent storage library]),
- LIBRARY_PACKS="$LIBRARY_PACKS DOOD")
-AC_MSG_RESULT($LIBRARY_PACKS)
-AC_SUBST(LIBRARY_PACKS)
-
# for now, replace mps only in pentium-linux
# gc is also replaced in sources/dfmc/c-run-time
AC_CONFIG_FILES(Makefile
Please sign in to comment.
Something went wrong with that request. Please try again.