mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

Make win32util/Configure aligned with autoconf-style

Browse Source
This commit is contained in:
Ondřej Surý
2020-05-21 10:04:31 +02:00
parent bfd87e453d
commit 009bb594a2
5 changed files with 121 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/dnssec/dnssec-dsfromkey.c
View File

@@ -331,7 +331,7 @@ usage(void) {
fprintf(stderr, " %s [options] -f zonefile [zonename]\n\n", program); fprintf(stderr, " %s [options] -f zonefile [zonename]\n\n", program);
fprintf(stderr, " %s [options] -s dnsname\n\n", program); fprintf(stderr, " %s [options] -s dnsname\n\n", program);
fprintf(stderr, " %s [-h|-V]\n\n", program); fprintf(stderr, " %s [-h|-V]\n\n", program);
fprintf(stderr, "Version: %s\n", VERSION); fprintf(stderr, "Version: %s\n", PACKAGE_VERSION);
fprintf(stderr, "Options:\n" fprintf(stderr, "Options:\n"
" -1: digest algorithm SHA-1\n" " -1: digest algorithm SHA-1\n"
" -2: digest algorithm SHA-256\n" " -2: digest algorithm SHA-256\n"

19
config.h.win32
View File

@@ -61,6 +61,20 @@
#error Minimum Visual Studio version is 2017 or higher #error Minimum Visual Studio version is 2017 or higher
#endif #endif
/* Setup package versions */
@PACKAGE_VERSION_MAJOR@
@PACKAGE_VERSION_MINOR@
@PACKAGE_VERSION_PATCH@
@PACKAGE_VERSION_EXTRA@
@PACKAGE_VERSION@
@PACKAGE_NAME@
@PACKAGE_DESCRIPTION@
@PACKAGE_SRCID@
@PACKAGE_CONFIGARGS@
@PACKAGE_BUILDER@
@PACKAGE_STRING@
@MAPAPI@
/* Define if you have the ANSI C header files. */ /* Define if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
@@ -209,8 +223,6 @@ typedef __int64 off_t;
/* /*
* Set up the Version Information * Set up the Version Information
*/ */
#include <versions.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
@@ -379,5 +391,4 @@ typedef __int64 off_t;
#define strlen(x) (unsigned int) strlen(x) #define strlen(x) (unsigned int) strlen(x)
#endif #endif
/* Get SRCID */ /* Hey Emacs, this is -*- c -*- file! */
#include "srcid.h"

8
lib/bind9/win32/libbind9.vcxproj.in
View File

@@ -73,8 +73,8 @@
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>.\libbind9.def</ModuleDefinitionFile> <ModuleDefinitionFile>.\libbind9.def</ModuleDefinitionFile>
<ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary> <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
<OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
@@ -106,8 +106,8 @@
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\isc\win32\$(Configuration);..\..\dns\win32\$(Configuration);..\..\isccfg\win32\$(Configuration);..\..\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>@OPENSSL_LIB@libisc.lib;libdns.lib;libisccfg.lib;libns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>.\libbind9.def</ModuleDefinitionFile> <ModuleDefinitionFile>.\libbind9.def</ModuleDefinitionFile>
<ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary> <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>

314
win32utils/Configure
View File

@@ -14,7 +14,9 @@
# This script builds nmake and visual studio build files # This script builds nmake and visual studio build files
# #
require 5.000; require 5.18.0;
no warnings 'experimental::smartmatch';
use strict; use strict;
use File::Spec; use File::Spec;
use Cwd; use Cwd;
@@ -173,7 +175,18 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj",
my %configdefh; my %configdefh;
my @substdefh = ("PACKAGE_CONFIGARGS", my @substdefh = ("PACKAGE_VERSION_MAJOR",
"PACKAGE_VERSION_MINOR",
"PACKAGE_VERSION_PATCH",
"PACKAGE_VERSION_EXTRA",
"PACKAGE_VERSION",
"PACKAGE_NAME",
"PACKAGE_DESCRIPTION",
"PACKAGE_SRCID",
"PACKAGE_CONFIGARGS",
"PACKAGE_BUILDER",
"PACKAGE_STRING",
"MAPAPI",
"DNS_RDATASET_FIXED", "DNS_RDATASET_FIXED",
"HAVE_GEOIP2", "HAVE_GEOIP2",
"HAVE_GSSAPI", "HAVE_GSSAPI",
@@ -569,44 +582,91 @@ if (($want_win32 eq "yes") && ($want_x64 eq "yes")) {
# Standard configure variable # Standard configure variable
$configvar{"EXEEXT"} = ".exe"; $configvar{"EXEEXT"} = ".exe";
# get the version information # Mimic AC_INIT() from autoconf by loading values from configure.ac
my %Versions; sub ac_init {
my $package_name;
my $package_bugreport;
my $package_url;
my $package_version;
my $package_version_major;
my $package_version_minor;
my $package_version_patch;
my $package_version_extra;
my $package_description;
my $package_srcid;
my $package_builder = "msvc";
my $mapapi;
sub getversion { open V, "..\\configure.ac" || die $!;
my $data;
my $name;
my $value;
my $version;
open V, "..\\version" || die $!;
while (<V>) { while (<V>) {
chomp; chomp;
($data) = split(/\#/); if (/^AC_INIT\(\[(.*?)\],\s*bind_PKG_VERSION,\s*\[(.*?)\],\s*\[(.*?)\],\s*\[(.*?)\]\)$/) {
if ($data) { $package_name = $1;
($name, $value) = split(/=/, $data); $package_bugreport = $2;
($name) = split(/\s+/, $name); $package_url = $4;
if ($name eq 'PRODUCT' || $name eq 'DESCRIPTION') { } elsif (/m4_define\(\[bind_VERSION_MAJOR\],\s*(.*?)\)/) {
($value) =~ s/^["\s]+//; $package_version_major = $1;
($value) =~ s/["\s]+$//; } elsif (/m4_define\(\[bind_VERSION_MINOR\],\s*(.*?)\)/) {
} else { $package_version_minor = $1;
($value) = split(/\s+/, $value); } elsif (/m4_define\(\[bind_VERSION_PATCH\],\s*(.*?)\)/) {
} $package_version_patch = $1;
$Versions{$name} = $value; } elsif (/m4_define\(\[bind_VERSION_EXTRA\],\s*(.*?)\)/) {
$package_version_extra = $1;
} elsif (/m4_define\(\[bind_DESCRIPTION\],\s*\[(.*?)\]\)/) {
$package_description = $1;
} elsif (/AC_DEFINE\(\[MAPAPI\],\s*\[(.*?)\],\s*\[.*?\]\)/) {
$mapapi = $1;
} }
} }
close V; close V;
$version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}"; $package_version = "${package_version_major}.${package_version_minor}.${package_version_patch}${package_version_extra}";
if ($Versions{'PATCHVER'} ne "") {
$version = "$version.$Versions{'PATCHVER'}"; my $srcid_fn = "..\\srcid";
if (-f $srcid_fn) {
open(my $fh, '<', $srcid_fn) or die "cannot open file $srcid_fn";
{
local $/;
$package_srcid = <$fh>;
} }
$version = "$version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}"; close($fh);
$version = "$version$Versions{'EXTENSIONS'}"; } elsif (-d "..\\.git") {
$configvar{"BIND9_VERSION"} = "$version"; $package_srcid = substr(`git rev-list --max-count=1 HEAD`, 0, 7);
} else {
$package_srcid = "";
}
chomp($package_srcid);
if (length($package_srcid) == 0) {
$package_srcid = "unset_id";
}
if ($verbose) {
print "BIND SRCID: $package_srcid\n";
}
# Now define those in config.h
$configdefh{'PACKAGE_NAME'} = "\"$package_name\"";
$configdefh{'PACKAGE_BUGREPORT'} = "\"$package_bugreport\"";
$configdefh{'PACKAGE_URL'} = "\"$package_url\"";
$configdefh{'PACKAGE_VERSION_MAJOR'} = "\"$package_version_major\"";
$configdefh{'PACKAGE_VERSION_MINOR'} = "\"$package_version_minor\"";
$configdefh{'PACKAGE_VERSION_PATCH'} = "\"$package_version_patch\"";
$configdefh{'PACKAGE_VERSION_EXTRA'} = "\"$package_version_extra\"";
$configdefh{'PACKAGE_DESCRIPTION'} = "\" $package_description\"";
$configdefh{'PACKAGE_SRCID'} = "\"$package_srcid\"";
$configdefh{'PACKAGE_VERSION'} = "\"$package_version\"";
$configdefh{'PACKAGE_STRING'} = "\"$package_name $package_version\"";
$configdefh{'MAPAPI'} = $mapapi;
$configdefh{'PACKAGE_BUILDER'} = $package_builder;
} }
getversion(); ac_init();
# append seen args to CONFIGARGS define # append seen args to CONFIGARGS define
@@ -1381,7 +1441,7 @@ if ($use_openssl eq "yes") {
if (scalar(@dirlist) != 1) { if (scalar(@dirlist) != 1) {
die "find more than one OpenSSL libcrypto-*.dll DLL candidate\n"; die "find more than one OpenSSL libcrypto-*.dll DLL candidate\n";
} }
$openssl_dll = File::Spec->catdir($openssl_path, "@dirlist[0]"); $openssl_dll = File::Spec->catdir($openssl_path, "$dirlist[0]");
} }
$cryptolib = "openssl"; $cryptolib = "openssl";
@@ -1623,7 +1683,7 @@ if ($use_gssapi eq "no") {
if ($verbose) { if ($verbose) {
print "checking for gssapi directory at \"$gssapi_path\"\n"; print "checking for gssapi directory at \"$gssapi_path\"\n";
} }
$configcond{"GEOIP"} = 1; $configcond{"GSSAPI"} = 1;
$configdefh{"HAVE_GSSAPI"} = 1; $configdefh{"HAVE_GSSAPI"} = 1;
if (-f File::Spec->catfile($gssapi_path, "include", if (-f File::Spec->catfile($gssapi_path, "include",
"gssapi", "gssapi.h")) { "gssapi", "gssapi.h")) {
@@ -2345,193 +2405,6 @@ sub setupproject {
close F; close F;
} }
# make versions.h
sub makeversion {
# List of directories with version files
my @dirlist = ("isc", "dns", "ns", "isccc", "isccfg", "bind9", "irs");
my %LibMacros = (
"bind9" => "LIBBIND9_EXPORTS",
"dns" => "LIBDNS_EXPORTS",
"irs" => "LIBIRS_EXPORTS",
"isc" => "LIBISC_EXPORTS",
"isccc" => "LIBISCCC_EXPORTS",
"isccfg" => "LIBISCCFG_EXPORTS",
"ns" => "LIBNS_EXPORTS");
my @VersionNames = ("LIBINTERFACE", "LIBREVISION", "LIBAGE");
my $Version;
my %ApiVersions;
my $Mapapi;
my $versionfile = "versions.h";
my $versionpath = "..\\$versionfile";
my $data;
my $name;
my $value;
# And the mapapi one
open M, "..\\lib\\dns\\mapapi" || die $!;
while (<M>) {
chomp;
($data) = split(/\#/);
if ($data) {
($name, $value) = split(/=/, $data);
($name) = split(/\s+/, $name);
if ($name eq 'MAPAPI') {
($value) =~ s/^["\s]+//;
($value) =~ s/["\s]+$//;
} else {
($value) = split(/\s+/, $value);
}
$Mapapi = $value;
}
}
close M;
# Now set up the output version file
my $ThisDate = scalar localtime();
open O, ">$versionpath" ||
die "Can't open output file $versionpath: $!\n";
# Standard Header
print O '/*
* Copyright (C) 2001 Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
';
print O "/*\n";
print O " * $versionfile.";
print O " Generated automatically by Configure.pl.\n";
print O " * Date generated: $ThisDate\n";
print O " */\n\n";
print O '
#ifndef VERSIONS_H
#define VERSIONS_H 1
';
$Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}";
if ($Versions{'PATCHVER'} ne "") {
$Version = "$Version.$Versions{'PATCHVER'}";
}
$Version = "$Version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}";
$Version = "$Version$Versions{'EXTENSIONS'}";
if ($verbose) {
print "BIND Version: $Version\n";
}
print O "#define VERSION \"$Version\"\n";
print O "#define PRODUCT \"$Versions{'PRODUCT'}\"\n\n";
print O "#define DESCRIPTION \"$Versions{'DESCRIPTION'}\"\n\n";
print O
"#define MAJOR \"$Versions{'MAJORVER'}.$Versions{'MINORVER'}\"\n\n";
print O "#define MAPAPI \"$Mapapi\"\n\n";
my $dir;
my $apifile;
foreach $dir (@dirlist) {
$apifile = "..\\lib\\$dir\\api";
open A, $apifile || die $!;
while (<A>) {
chomp;
($data) = split(/\#/);
if ($data) {
($name, $value) = split(/=/, $data);
$name =~ s/\s+//;
$value =~ s/\s+//;
$ApiVersions{$name} = $value;
}
}
close A;
print O "\n#ifdef $LibMacros{$dir}\n";
foreach $name (@VersionNames) {
print O "#define $name\t$ApiVersions{$name}\n";
}
print O "#endif\n\n";
}
print O "#endif /* VERSIONS_H */\n";
close O;
}
# make srcid.h
sub makesrcid {
my $data;
my $name;
my $value;
my $srcid = "unset_id";
open SOUT, ">..\\srcid.h" || die "cannot open srcid.h: $!\n";
if (open (SIN, "..\\srcid")) {
LOOP: while (<SIN>) {
chomp;
($data) = split(/\#/);
if ($data) {
($name, $value) = split(/=/, $data);
($name) = split(/\s+/, $name);
($value) = split(/\s+/, $value);
next LOOP if ($name != "SRCID");
$srcid = $value;
}
}
close SIN;
}
if ($srcid eq "unset_id" and -d "..\\.git") {
$data = `git rev-list --max-count=1 HEAD`;
if (length($data) > 0) {
$srcid = substr($data, 0, 7);
}
}
# Now set up the output version file
my $ThisDate = scalar localtime();
# Standard Header
print SOUT '/*
* Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
';
print SOUT "/*\n";
print SOUT " * srcid.h";
print SOUT " * Generated automatically by Configure.pl.\n";
print SOUT " * Date generated: $ThisDate\n";
print SOUT " */\n\n";
print SOUT '
#ifndef SRCID_H
#define SRCID_H 1
';
if ($verbose) {
print "BIND SRCID: $srcid\n";
}
print SOUT "#define SRCID\t\"$srcid\"\n";
print SOUT "#endif /* SRCID_H */\n";
close SOUT;
}
# Build install files # Build install files
sub makeinstallfile { sub makeinstallfile {
@@ -2739,10 +2612,6 @@ if (($want_win32 eq "yes") || ($want_x64 eq "yes")) {
setupproject($file); setupproject($file);
} }
makeversion();
makesrcid();
makeinstallfile(); makeinstallfile();
print "Configured.\n"; print "Configured.\n";
@@ -2754,7 +2623,6 @@ exit 0;
# Notes: Unix configure.in options # Notes: Unix configure.in options
# --enable-developer partially supported # --enable-developer partially supported
# --enable-newstats (9.9/9.9sub only)
# --enable-native-pkcs11 supported # --enable-native-pkcs11 supported
# --enable-openssl-version-check included without a way to disable it # --enable-openssl-version-check included without a way to disable it
# --enable-openssl-hash supported # --enable-openssl-hash supported

1
win32utils/bind9.sln.in
View File

@@ -115,6 +115,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbind9", "..\lib\bind9\wi
{3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}
{B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047} {B556705F-1920-4400-878A-B259D3556047} = {B556705F-1920-4400-878A-B259D3556047}
{5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A}
{82ACD33C-E75F-45B8-BB6D-42643A10D7EE} = {82ACD33C-E75F-45B8-BB6D-42643A10D7EE}
{B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1} {B2DFA58C-6347-478E-81E8-01E06999D4F1} = {B2DFA58C-6347-478E-81E8-01E06999D4F1}
EndProjectSection EndProjectSection
EndProject EndProject