Commit 0f01b7bc authored by Richard Levitte's avatar Richard Levitte
Browse files

Adapt the build files to the new "install" hash table 



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

Configurations/descrip.mms.tmpl

+9 −5
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
  # Because we need to make two computations of these data,

  # we store them in arrays for reuse

  our @shlibs = map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}};

  our @install_shlibs = map { $unified_info{sharednames}->{$_} || () } @{$unified_info{install}->{libraries}};

  our @programs = grep { !m|^\[\.test\]| } @{$unified_info{programs}};

  our @testprogs = grep { m|^\[\.test\]| } @{$unified_info{programs}};

  our @generated = ( ( map { (my $x = $_) =~ s|\.S$|\.s|; $x }
@@ -130,6 +131,10 @@ DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } 
GENERATED_MANDATORY={- join(", ", map { "-\n\t".$_ } @{$unified_info{depends}->{""}} ) -}

GENERATED={- join(", ", map { "-\n\t".$_ } @generated) -}



INSTALL_LIBS={- join(", ", map { "-\n\t".$_.".OLB" } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBS={- join(", ", map { "-\n\t".$_.".EXE" } @install_shlibs) -}

INSTALL_ENGINES={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{install}->{engines}}) -}

INSTALL_PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{install}->{programs}}) -}

{- output_off() if $disabled{apps}; "" -}

BIN_SCRIPTS=[.tools]c_rehash.pl

MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl
@@ -382,12 +387,11 @@ install_dev : check_INSTALLTOP 
        - CREATE/DIR ossl_installroot:[LIB.'arch']

        {- join("\n        ",

                map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }

                @{$unified_info{libraries}}) -}

                @{$unified_info{install}->{libraries}}) -}

        @ {- output_off() if $disabled{shared}; "" -} !

        {- join("\n        ",

                map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[LIB.'arch']" }

                map { $unified_info{sharednames}->{$_} || () }

                @{$unified_info{libraries}}) -}

                map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }

                @install_shlibs) -}

        @ {- output_on() if $disabled{shared}; "" -} !



install_runtime : check_INSTALLTOP
@@ -407,7 +411,7 @@ install_engines : check_INSTALLTOP 
        - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch']

        {- join("\n        ",

                map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover$target{pointer_size}.'arch']" }

                grep(!m|ossltest$|i, @{$unified_info{engines}})) -}

                @{$unified_info{install}->{engines}}) -}

        @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} !



install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -

Configurations/unix-Makefile.tmpl

+16 −15
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ SHLIB_TARGET={- $target{shared_target} -} 


LIBS={- join(" ", map { $_.$libext } @{$unified_info{libraries}}) -}

SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{libraries}}) -}

SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -}

ENGINES={- join(" ", map { dso($_) } @{$unified_info{engines}}) -}

PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test/| } @{$unified_info{programs}}) -}

TESTPROGS={- join(" ", map { $_.$exeext } grep { m|^test/| } @{$unified_info{programs}}) -}
@@ -103,13 +104,16 @@ GENERATED={- join(" ", 
                    grep { /\.o$/ } keys %{$unified_info{sources}} ),

                  ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}



INSTALL_LIBS={- join(" ", map { $_.$libext } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{install}->{libraries}}) -}

INSTALL_ENGINES={- join(" ", map { dso($_) } @{$unified_info{install}->{engines}}) -}

INSTALL_PROGRAMS={- join(" ", map { $_.$exeext } @{$unified_info{install}->{programs}}) -}

{- output_off() if $disabled{apps}; "" -}

BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash

MISC_SCRIPTS=$(BLDDIR)/apps/CA.pl $(BLDDIR)/apps/tsget

{- output_on() if $disabled{apps}; "" -}



SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -}



# DESTDIR is for package builders so that they can configure for, say,

# /usr/ and yet have everything installed to /tmp/somedir/usr/.

# Normally it is left empty.
@@ -355,7 +359,7 @@ install_dev: 
		chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \

	done

	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)

	@set -e; for l in $(LIBS); do \

	@set -e; for l in $(INSTALL_LIBS); do \

		fn=`basename $$l`; \

		echo "install $$l -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \

		cp $$l $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \
@@ -365,7 +369,7 @@ install_dev: 
		      $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \

	done

	@ : {- output_off() if $disabled{shared}; "" -}

	@set -e; for s in $(SHLIB_INFO); do \

	@set -e; for s in $(INSTALL_SHLIB_INFO); do \

		s1=`echo "$$s" | cut -f1 -d";"`; \

		s2=`echo "$$s" | cut -f2 -d";"`; \

		fn1=`basename $$s1`; \
@@ -414,13 +418,13 @@ uninstall_dev: 
	done

	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl

	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include

	@set -e; for l in $(LIBS); do \

	@set -e; for l in $(INSTALL_LIBS); do \

		fn=`basename $$l`; \

		echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \

		$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \

	done

	@ : {- output_off() if $disabled{shared}; "" -}

	@set -e; for s in $(SHLIB_INFO); do \

	@set -e; for s in $(INSTALL_SHLIB_INFO); do \

		s1=`echo "$$s" | cut -f1 -d";"`; \

		s2=`echo "$$s" | cut -f2 -d";"`; \

		fn1=`basename $$s1`; \
@@ -448,12 +452,9 @@ install_engines: 
	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)

	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/

	@echo "*** Installing engines"

	@set -e; for e in dummy $(ENGINES); do \

	@set -e; for e in dummy $(INSTALL_ENGINES); do \

		if [ "$$e" = "dummy" ]; then continue; fi; \

		fn=`basename $$e`; \

		if [ "$$fn" = '{- dso("ossltest") -}' ]; then \

			continue; \

		fi; \

		echo "install $$e -> $(DESTDIR)$(ENGINESDIR)/$$fn"; \

		cp $$e $(DESTDIR)$(ENGINESDIR)/$$fn.new; \

		chmod 755 $(DESTDIR)$(ENGINESDIR)/$$fn.new; \
@@ -463,7 +464,7 @@ install_engines: 


uninstall_engines:

	@echo "*** Uninstalling engines"

	@set -e; for e in dummy $(ENGINES); do \

	@set -e; for e in dummy $(INSTALL_ENGINES); do \

		if [ "$$e" = "dummy" ]; then continue; fi; \

		fn=`basename $$e`; \

		if [ "$$fn" = '{- dso("ossltest") -}' ]; then \
@@ -480,7 +481,7 @@ install_runtime: 
	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/misc

	@echo "*** Installing runtime files"

	@ : {- output_off() unless windowsdll(); "" -}

	@set -e; for s in dummy $(SHLIBS); do \

	@set -e; for s in dummy $(INSTALL_SHLIBS); do \

		if [ "$$s" = "dummy" ]; then continue; fi; \

		fn=`basename $$s`; \

		echo "install $$s -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
@@ -490,7 +491,7 @@ install_runtime: 
		      $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \

	done

	@ : {- output_on() unless windowsdll(); "" -}

	@set -e; for x in dummy $(PROGRAMS); do \

	@set -e; for x in dummy $(INSTALL_PROGRAMS); do \

		if [ "$$x" = "dummy" ]; then continue; fi; \

		fn=`basename $$x`; \

		echo "install $$x -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
@@ -511,7 +512,7 @@ install_runtime: 


uninstall_runtime:

	@echo "*** Uninstalling runtime files"

	@set -e; for x in dummy $(PROGRAMS); \

	@set -e; for x in dummy $(INSTALL_PROGRAMS); \

	do  \

		if [ "$$x" = "dummy" ]; then continue; fi; \

		fn=`basename $$x`; \
@@ -533,7 +534,7 @@ uninstall_runtime: 
		$(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \

	done

	@ : {- output_off() unless windowsdll(); "" -}

	@set -e; for s in dummy $(SHLIBS); do \

	@set -e; for s in dummy $(INSTALL_SHLIBS); do \

		if [ "$$s" = "dummy" ]; then continue; fi; \

		fn=`basename $$s`; \

		echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \

Configurations/windows-makefile.tmpl

+19 −12
Original line number Diff line number Diff line
@@ -69,11 +69,6 @@ PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test\\| } @{$unified_info{pr 
PROGRAMPDBS={- join(" ", map { $_.".pdb" } grep { !m|^test\\| } @{$unified_info{programs}}) -}

TESTPROGS={- join(" ", map { $_.$exeext } grep { m|^test\\| } @{$unified_info{programs}}) -}

SCRIPTS={- join(" ", @{$unified_info{scripts}}) -}

{- output_off() if $disabled{apps}; "" -}

BIN_SCRIPTS=$(BLDDIR)\tools\c_rehash.pl

MISC_SCRIPTS=$(BLDDIR)\apps\CA.pl $(BLDDIR)\apps\tsget.pl

{- output_on() if $disabled{apps}; "" -}



{- output_off() if $disabled{makedepend}; "" -}

DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; }

                  grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ }
@@ -87,6 +82,18 @@ GENERATED={- join(" ", 
                    grep { /\.o$/ } keys %{$unified_info{sources}} ),

                  ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}



INSTALL_LIBS={- join(" ", map { $_.$libext } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; shlib($_) } @{$unified_info{install}->{libraries}}) -}

INSTALL_ENGINES={- join(" ", map { dso($_) } @{$unified_info{install}->{engines}}) -}

INSTALL_ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; dso($_) } @{$unified_info{install}->{engines}}) -}

INSTALL_PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -}

INSTALL_PROGRAMPDBS={- join(" ", map { $_.".pdb" } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -}

{- output_off() if $disabled{apps}; "" -}

BIN_SCRIPTS=$(BLDDIR)\tools\c_rehash.pl

MISC_SCRIPTS=$(BLDDIR)\apps\CA.pl $(BLDDIR)\apps\tsget.pl

{- output_on() if $disabled{apps}; "" -}



# Do not edit these manually. Use Configure with --prefix or --openssldir

# to change this!  Short explanation in the top comment in Configure

INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet
@@ -268,7 +275,7 @@ install_dev: 
	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BLDDIR)\include\openssl\*.h \

				       "$(INSTALLTOP)\include\openssl"

	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\$(LIBDIR)"

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(LIBS) \

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_LIBS) \

				       "$(INSTALLTOP)\$(LIBDIR)"

	@if "$(SHLIBS)"=="" \

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" ossl_static.pdb \
@@ -281,9 +288,9 @@ install_engines: 
	@echo *** Installing engines

	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(ENGINESDIR)"

	@if not "$(ENGINES)"=="" \

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(ENGINES) "$(ENGINESDIR)"

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_ENGINES) "$(ENGINESDIR)"

	@if not "$(ENGINES)"=="" \

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(ENGINEPDBS) "$(ENGINESDIR)"

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_ENGINEPDBS) "$(ENGINESDIR)"



uninstall_engines:
@@ -292,13 +299,13 @@ install_runtime: 
	@echo *** Installing runtime files

	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin"

	@if not "$(SHLIBS)"=="" \

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(SHLIBS) "$(INSTALLTOP)\bin"

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBS) "$(INSTALLTOP)\bin"

	@if not "$(SHLIBS)"=="" \

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(SHLIBPDBS) \

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBPDBS) \

                                        "$(INSTALLTOP)\bin"

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(PROGRAMS) \

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMS) \

                                        "$(INSTALLTOP)\bin"

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(PROGRAMPDBS) \

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMPDBS) \

                                        "$(INSTALLTOP)\bin"

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BIN_SCRIPTS) \

                                        "$(INSTALLTOP)\bin"