Commit 45c6e23c authored by Richard Levitte's avatar Richard Levitte
Browse files

Remove --classic build entirely 



The Unix build was the last to retain the classic build scheme.  The
new unified scheme has matured enough, even though some details may
need polishing.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent f863ad0c

.travis.yml

+6 −18
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ env: 
    - CONFIG_OPTS=""

    - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2"

    - CONFIG_OPTS="--strict-warnings no-shared" BUILDONLY="yes"

    - CONFIG_OPTS="--classic no-shared" BUILDONLY="yes"

    - CONFIG_OPTS="--classic" BUILDONLY="yes"

    - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes"

    - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes"
@@ -60,34 +58,24 @@ matrix: 
before_script:

    - sh .travis-create-release.sh $TRAVIS_OS_NAME

    - tar -xvzf _srcdist.tar.gz

    - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then

          srcdir=.;

          cd _srcdist;

      else

          srcdir=../_srcdist;

          mkdir _build;

          cd _build;

      fi

    - mkdir _build;

    - cd _build;

    - if [ "$CC" == i686-w64-mingw32-gcc ]; then

          export CROSS_COMPILE=${CC%%gcc}; unset CC;

          $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;

          ../_srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;

      elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then

          export CROSS_COMPILE=${CC%%gcc}; unset CC;

          $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;

          ../_srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;

      else

          if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then

              CC="ccache $CC";

          fi;

          $srcdir/config $CONFIG_OPTS;

          ../_srcdir/config $CONFIG_OPTS;

      fi

    - cd ..



script:

    - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then

          cd _srcdist;

      else

          cd _build;

      fi

    - cd _build;

    - make

    - if [ -z "$BUILDONLY" ]; then

          if [ -n "$CROSS_COMPILE" ]; then

Configurations/README

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ In each table entry, the following keys are significant: 
                           some options.  In this case, the first

                           string in the list is the name of the build

                           scheme.

                           Currently recognised build schemes are

                           "unixmake" and "unified".

                           Currently recognised build scheme is "unified".

                           For the "unified" build scheme, this item

                           *must* be an array with the first being the

                           word "unified" and the second being a word

Configure

+1 −23
Original line number Diff line number Diff line
@@ -458,8 +458,6 @@ my $target=""; 
$config{options}="";

$config{build_type} = "release";



my $classic = 0;



my @argvcopy=@ARGV;



if (grep /^reconf(igure)?$/, @argvcopy) {
@@ -644,11 +642,7 @@ foreach (@argvcopy) 
		}

	elsif (/^[-+]/)

		{

		if (/^--classic$/)

			{

			$classic=1;

			}

		elsif (/^--prefix=(.*)$/)

		if (/^--prefix=(.*)$/)

			{

			$config{prefix}=$1;

			die "Directory given with --prefix MUST be absolute\n"
@@ -904,22 +898,6 @@ $config{shared_ldflag} = ""; 
$target{build_scheme} = [ $target{build_scheme} ]

    if ref($target{build_scheme}) ne "ARRAY";



###### TO BE REMOVED WHEN CLASSIC BUILD IS REMOVED

######

###### If the user has chosen --classic, we give it to them.

###### If they try that with an out-of-source config, we complain.

if ($target{build_scheme}->[0] eq "unified" && $classic) {

    die "Can't perform a classic build out of source tree\n"

        if $srcdir ne $blddir;



    $target{build_scheme} = { unix    => [ "unixmake" ],

                              windows => undef,

                              VMS     => undef } -> {$target{build_scheme}->[1]};



    die "Classic mode unavailable on this platform\n"

        unless defined($target{build_scheme});

}



my ($builder, $builder_platform, @builder_opts) =

    @{$target{build_scheme}};

Makefile.in

deleted100644 → 0
+0 −798

File deleted.

Preview size limit exceeded, changes collapsed.

apps/Makefile.in

deleted100644 → 0
+0 −159
Original line number Diff line number Diff line 
#

#  apps/Makefile

#



DIR=		apps

TOP=		..

CC=		cc

INCLUDES=	-I$(TOP) -I../crypto -I../include

CFLAG=		-g -static -Wswitch

MAKEFILE=	Makefile

PERL=		perl

RM=		rm -f



PLIB_LDFLAG=

EX_LIBS= 

EXE_EXT= 



APPS_OBJ=



SHLIB_TARGET=



CFLAGS= $(INCLUDES) $(CFLAG)



GENERAL=Makefile makeapps.com install.com



DLIBCRYPTO=../libcrypto.a

DLIBSSL=../libssl.a

LIBCRYPTO=-L.. -lcrypto

LIBSSL=-L.. -lssl



SCRIPTS=CA.pl tsget

EXE= openssl$(EXE_EXT)

CONFS=openssl.cnf ct_log_list.cnf



COMMANDS= \

	asn1pars.o ca.o ciphers.o cms.o crl.o crl2p7.o dgst.o dhparam.o \

	dsa.o dsaparam.o ec.o ecparam.o enc.o engine.o errstr.o gendsa.o \

	genpkey.o genrsa.o nseq.o ocsp.o passwd.o pkcs12.o pkcs7.o pkcs8.o \

	pkey.o pkeyparam.o pkeyutl.o prime.o rand.o req.o rsa.o rsautl.o \

	s_client.o s_server.o s_time.o sess_id.o smime.o speed.o spkac.o \

	srp.o ts.o verify.o version.o x509.o rehash.o



EXTRA_OBJ=apps.o opt.o s_cb.o s_socket.o

EXTRA_SRC=apps.c opt.c s_cb.c s_socket.c

RAND_OBJ=app_rand.o

RAND_SRC=app_rand.c



OBJ	= $(COMMANDS)



SRC	= \

	asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \

	dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \

	genpkey.c genrsa.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c pkcs8.c \

	pkey.c pkeyparam.c pkeyutl.c prime.c rand.c req.c rsa.c rsautl.c \

	s_client.c s_server.c s_time.c sess_id.c smime.c speed.c spkac.c \

	srp.c ts.c verify.c version.c x509.c rehash.c



EXE_OBJ	= openssl.o $(OBJ) $(EXTRA_OBJ) $(RAND_OBJ) $(APPS_OBJ)

EXE_SRC = openssl.c $(SRC) $(EXTRA_SRC) $(RAND_SRC)



HEADER=	apps.h progs.h s_apps.h \

	testdsa.h testrsa.h timeouts.h



ALL=    $(GENERAL) $(EXE_SRC) $(HEADER)



top:

	@(cd ..; $(MAKE) DIRS=$(DIR) all)



all:	exe scripts



exe:	$(EXE)



scripts: $(SCRIPTS)



openssl-vms.cnf: openssl.cnf

	$(PERL) $(TOP)/VMS/VMSify-conf.pl < openssl.cnf > openssl-vms.cnf



install:

	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...

	@set -e; for i in $(EXE); \

	do \

		echo installing $$i; \

		cp $$i $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \

		chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \

		mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$i.new $(DESTDIR)$(INSTALLTOP)/bin/$$i; \

	done

	@set -e; for i in $(SCRIPTS); \

	do \

		echo installing $$i; \

		cp $$i $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \

		chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \

		mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \

	done

	@set -e; for i in $(CONFS); \

	do \

		echo installing $$i; \

		cp $$i $(DESTDIR)$(OPENSSLDIR)/$$i.new; \

		chmod 644 $(DESTDIR)$(OPENSSLDIR)/$$i.new; \

		mv -f $(DESTDIR)$(OPENSSLDIR)/$$i.new $(DESTDIR)$(OPENSSLDIR)/$$i; \

	done



uninstall:

	@set -e; for i in $(EXE); \

	do \

		echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \

		$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \

	done

	@set -e; for i in $(SCRIPTS); \

	do \

		echo $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \

		$(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \

	done

	@set -e; for i in $(CONFS); \

	do \

		echo $(RM) $(DESTDIR)$(OPENSSLDIR)/$$i; \

		$(RM) $(DESTDIR)$(OPENSSLDIR)/$$i; \

	done



generate: openssl-vms.cnf progs.h



depend:

	$(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(EXE_SRC)



clean:

	rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)

	rm -f req



$(DLIBSSL):

	(cd ..; $(MAKE) build_libssl)



$(DLIBCRYPTO):

	(cd ..; $(MAKE) build_libcrypto)



$(EXE): $(EXE_OBJ) $(DLIBCRYPTO) $(DLIBSSL)

	$(RM) $(EXE)

	shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \

		shlib_target="$(SHLIB_TARGET)"; \

	fi; \

	LIBRARIES="$(LIBSSL) $(LIBCRYPTO)" ; \

	$(MAKE) -f $(TOP)/Makefile.shared -e \

		APPNAME=$(EXE) OBJECTS="$(EXE_OBJ)" \

		LDFLAG="$(LDFLAG)" \

		LIBDEPS="$(PLIB_LDFLAG) $$LIBRARIES $(EX_LIBS)" \

		link_app.$${shlib_target}



progs.h: progs.pl Makefile.in

	$(RM) progs.h

	$(PERL) progs.pl $(EXE_SRC) > progs.h



CA.pl: CA.pl.in

	$(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl -oapps/Makefile CA.pl.in > CA.pl.new

	mv CA.pl.new CA.pl



tsget:	tsget.in

	$(PERL) -I$(TOP) -Mconfigdata $(TOP)/util/dofile.pl -oapps/Makefile tsget.in > tsget.new

	mv tsget.new tsget





# DO NOT DELETE THIS LINE -- make depend depends on it.