DEVEL15-windows-make-cygwin-libs-20090519

LICENSE MIT

Unless NOCYGWIN is defined create cygwin .a import libraries
for each OpenAFS DLL that is constructed.

(cherry picked from commit 4e9bd3bd0ec5977609fd75d681fcc6dbd24a8c6f)

diff --git a/src/WINNT/install/wix/NTMakefile b/src/WINNT/install/wix/NTMakefile
index 8ffc5d20b239bbd8bc7faeaf9898aed8ad454400..eedbd5937a97c38a102188837c96bd43a5ea7e23 100644 (file)
--- a/src/WINNT/install/wix/NTMakefile
+++ b/src/WINNT/install/wix/NTMakefile
@@ -35,6 +35,11 @@ WIXOBJ = $(OUT)\openafs-$(LANG).wixobj
 !IF ("$(CPU)" == "i386")
 BINWIXOBJ  = $(OUT)\openafs-32bit-tools-$(LANG).wixobj
 !ENDIF
+!IFNDEF NOCYGWIN
+WIXCYGOPT=-dCygwinArchives
+!ELSE
+WIXCYGOPT=
+!ENDIF
 
 LANGUAGES=en_US de_DE es_ES ja_JP ko_KR pt_BR zh_CN zh_TW
 
@@ -83,7 +88,7 @@ $(WIXOBJ): openafs.wxs $(WIXINCLUDES)
                -dIDNMRedistDir=$(MSIDNNLS)\\REDIST     \
                -v0 \
                -w0 \
-        $(AFSDEV_AUXWIXDEFINES)        openafs.wxs
+               $(WIXCYGOPT) $(AFSDEV_AUXWIXDEFINES)    openafs.wxs
 
 !IF ("$(CPU)" == "i386")
 $(BINWIXOBJ): oafwbins.wxs $(WIXINCLUDES)
@@ -98,7 +103,7 @@ $(BINWIXOBJ): oafwbins.wxs $(WIXINCLUDES)
                -dCellDbFile=CellServDB \
                -v0 \
                -w0 \
-        $(AFSDEV_AUXWIXDEFINES)        oafwbins.wxs
+        $(WIXCYGOPT) $(AFSDEV_AUXWIXDEFINES)   oafwbins.wxs
 
 $(BINMSIFILE): $(BINWIXOBJ)
        light -nologo -out $(BINMSIFILE) \

diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index 6d262e8a5521a2ea55f57ec822ab20275b401649..873fb9785616323e354936e7e03b16105b384f08 100644 (file)
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -247,6 +247,10 @@
                                <ComponentRef Id="cmp_SDK_Include_Winnt" />
                                <ComponentRef Id="cmp_SDK_Lib" />
                                <ComponentRef Id="cmp_SDK_Lib_Afs" />
+                <?ifdef CygwinArchives ?>
+                <ComponentRef Id="cmp_SDK_Lib_Cygwin" />
+                <ComponentRef Id="cmp_SDK_Lib_Afs_Cygwin" />
+                <?endif?>
 
                        <?ifdef DebugSyms?>
                                <Feature Id="feaSDKDebug" AllowAdvertise="no" Description="$(loc.StrAFSSDKDebugLongDesc)" Display="expand"

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index e6beb6c3253637e1244ba6999c1440e367b4e0c1..94bd82497240be40e9ab4448f9eba11bd37d4d8d 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1704,6 +1704,13 @@
                             <File Id="filecm_config_OBJ" Name="CM_CON~1.obj" LongName="cm_config.obj" DiskId="1" src="$(var.LibDir)cm_config.obj" /> 
                             <File Id="filecm_dns_OBJ" Name="cm_dns.obj" LongName="cm_dns.obj" DiskId="1" src="$(var.LibDir)cm_dns.obj" /> 
                         </Component>
+                        <?ifdef CygwinArchives?>
+                        <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib_Cygwin" Guid="$(var.cmp_SDK_Lib_Cygwin_guid)">
+                          <File Id="fileafsauthent_A" Name="afsauth.a" LongName="afsauthent.a" DiskId="1" src="$(var.LibDir)afsauthent.a" />
+                          <File Id="fileafspthread_A" Name="afspthrd.a" LongName="afspthread.a" DiskId="1" src="$(var.LibDir)afspthread.a" />
+                          <File Id="fileafsrpc_A" Name="afsrpc.a" LongName="afsrpc.a" DiskId="1" src="$(var.LibDir)afsrpc.a" />
+                        </Component>
+                        <?endif?>
                         <Directory Id="dirLibAfs" Name="afs">
                             <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib_Afs" Guid="$(var.cmp_SDK_Lib_Afs_guid)">
                                 <File Id="fileafsacl_LIB" Name="afsacl.lib" LongName="afsacl.lib" DiskId="1" src="$(var.LibDir)afs\afsacl.lib" /> 
@@ -1744,6 +1751,18 @@
                                 <File Id="fileTaAfsAppLib_LIB" Name="TAAFSA~2.lib" LongName="TaAfsAppLib.lib" DiskId="1" src="$(var.LibDir)afs\TaAfsAppLib.lib" /> 
                                 <File Id="filetalocale_LIB" Name="talocale.lib" LongName="talocale.lib" DiskId="1" src="$(var.LibDir)afs\talocale.lib" /> 
                             </Component>
+                            <?ifdef CygwinArchives?>
+                            <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib_Afs_Cygwin" Guid="$(var.cmp_SDK_Lib_Afs_Cygwin_guid)">
+                                <File Id="fileafsadminutil_A" Name="afsadmut.a" LongName="afsadminutil.a" DiskId="1" src="$(var.ServerDir)afsadminutil.a" /> 
+                                <File Id="fileafsbosadmin_A" Name="afsbosad.a" LongName="afsbosadmin.a" DiskId="1" src="$(var.ServerDir)afsbosadmin.a" /> 
+                                <File Id="fileafscfgadmin_A" Name="afscfgad.a" LongName="afscfgadmin.a" DiskId="1" src="$(var.ServerDir)afscfgadmin.a" /> 
+                                <File Id="fileafsclientadmin_A" Name="afscliad.a" LongName="afsclientadmin.a" DiskId="1" src="$(var.ServerDir)afsclientadmin.a" /> 
+                                <File Id="fileafskasadmin_A" Name="afskasad.a" LongName="afskasadmin.a" DiskId="1" src="$(var.ServerDir)afskasadmin.a" /> 
+                                <File Id="fileafsprocmgmt_A" Name="afsprcmg.a" LongName="afsprocmgmt.a" DiskId="1" src="$(var.ServerDir)afsprocmgmt.a" /> 
+                                <File Id="fileafsptsadmin_A" Name="afsptsad.a" LongName="afsptsadmin.a" DiskId="1" src="$(var.ServerDir)afsptsadmin.a" /> 
+                                <File Id="fileafsvosadmin_A" Name="afsvosad.a" LongName="afsvosadmin.a" DiskId="1" src="$(var.ServerDir)afsvosadmin.a" /> 
+                            </Component>
+                            <?endif?>
                         </Directory>
                     </Directory>
             </Directory> <!-- SDK -->

diff --git a/src/WINNT/install/wix/platform.wxi b/src/WINNT/install/wix/platform.wxi
index 473fc4490f75ff43adf4a9524c9fc85b987affe4..86e9bf42a36879f952fd87e961f009ae00ea63cf 100644 (file)
--- a/src/WINNT/install/wix/platform.wxi
+++ b/src/WINNT/install/wix/platform.wxi
@@ -79,6 +79,8 @@
        <?define cmp_ClientProgramDebug_guid="FC0AD966-9323-4AAA-96D1-FFEF44460E59"?>
        <?define cmp_SDK_Lib_guid="A7CC24B1-E6A9-4254-B468-F4C47BC9ECFC"?>
        <?define cmp_SDK_Lib_Afs_guid="C0DA2C3B-B2B8-4AD4-9B00-42FB45C5B352"?>
+       <?define cmp_SDK_Lib_Cygwin_guid="6F09E575-6482-4D90-A6CD-408321539679"?>
+       <?define cmp_SDK_Lib_Afs_Cygwin_guid="19AB6F3B-AE92-40D8-8C68-3F39A1AB68C0"?>
        <?define cmf_vlserver_EXE_guid="88A9024C-D5B2-4AF1-8241-E0B046E25FE3"?>
        <?define cmf_volinfo_EXE_guid="55C8984F-D58A-44FD-9566-3C033612B2DB"?>
        <?define cmf_volserver_EXE_guid="98049267-9D3C-4BBC-B5E5-E3A0BCE0B8AF"?>
@@ -183,6 +185,8 @@
        <?define cmp_ClientProgramDebug_guid="A6A394F6-45D0-45A9-A7DD-C0997070EC14"?>
        <?define cmp_SDK_Lib_guid="71BC1B4E-4C4C-4FF8-8DDA-C6AB2BE22142"?>
        <?define cmp_SDK_Lib_Afs_guid="CD671A64-D491-4363-A7AD-645482B481BE"?>
+       <?define cmp_SDK_Lib_Cygwin_guid="EA2FC9C5-2001-41F7-9220-A5C63B2C523D"?>
+       <?define cmp_SDK_Lib_Afs_Cygwin_guid="F342A346-E149-47A2-9206-5B51EED7E689"?>
        <?define cmf_vlserver_EXE_guid="F6A43B78-EE17-4483-AA81-4B6C6957977D"?>
        <?define cmf_volinfo_EXE_guid="CED56F48-1049-403F-912B-3C186867B563"?>
        <?define cmf_volserver_EXE_guid="36A386A0-6DA9-40A7-A12D-6A521559933D"?>

diff --git a/src/WINNT/pthread/NTMakefile b/src/WINNT/pthread/NTMakefile
index a685cb7c13d9e2b4854a57084d3288d911d93da2..9e85b8dd89a6288e2387d68bd6a94a471a73598c 100644 (file)
--- a/src/WINNT/pthread/NTMakefile
+++ b/src/WINNT/pthread/NTMakefile
@@ -32,6 +32,7 @@ $(PTHR_DLLFILE): $(PTHR_DLLOBJS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def pthread.def
 
 install: $(PTHR_DLLFILE) $(LIBINCLUDES)
 

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index acf4cc9864aaa56d4913fc3a62728d26ba4aa22b..ba12443287b1fdc5852f877a246b63eb3e764d97 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -477,3 +477,13 @@ AFSDEV_AUXMIDLFLAGS=/env x64 /x64 /Oicf
 LEX = flex -l
 YACC = bison
 
+######### Create Cygwin .a files
+# This macro should be invoked as a build step for a DLL target.
+!IFNDEF NOCYGWIN
+MAKECYGLIB=\
+       for %%C in (as.exe) do \
+       if exist %%~$$PATH:C \
+       dlltool --dllname $(@B).dll --output-lib $(@R).a --temp-prefix $(OUT) -S %%~$$PATH:C
+!ELSE
+MAKECYGLIB=echo Skipping Cygwin archive
+!ENDIF

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 09df33ee7d0c66c738e1b46fe0e6ee88f363552e..f050e45f1ca6420f1dc10390cbd7c5024a9de680 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -455,3 +455,13 @@ AFSDEV_AUXMIDLFLAGS=$(AFSDEV_AUXMIDLFLAGS) /Oi
 LEX = flex -l
 YACC = bison
 
+######### Create Cygwin .a files
+# This macro should be invoked as a build step for a DLL target.
+!IFNDEF NOCYGWIN
+MAKECYGLIB=\
+       for %%C in (as.exe) do \
+       if exist %%~$$PATH:C \
+       dlltool --dllname $(@B).dll --output-lib $(@R).a --temp-prefix $(OUT) -S %%~$$PATH:C
+!ELSE
+MAKECYGLIB=echo Skipping Cygwin archive
+!ENDIF

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 37aea7474a7d237d6eea7fcd6f2dbd55d18a3f49..84d57da2e09cb8113a9c18e4be6c5df5d976000c 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -481,3 +481,14 @@ AFSDEV_AUXMIDLFLAGS=/env win32 /win32 /no_robust /Oicf
 LEX = flex -l
 YACC = bison
 
+
+######### Create Cygwin .a files
+# This macro should be invoked as a build step for a DLL target.
+!IFNDEF NOCYGWIN
+MAKECYGLIB=\
+       for %%C in (as.exe) do \
+       if exist %%~$$PATH:C \
+       dlltool --dllname $(@B).dll --output-lib $(@R).a --temp-prefix $(OUT) -S %%~$$PATH:C
+!ELSE
+MAKECYGLIB=echo Skipping Cygwin archive
+!ENDIF

diff --git a/src/libadmin/adminutil/NTMakefile b/src/libadmin/adminutil/NTMakefile
index d6b085e44b4c9d65cfbc5207121e9cda3a8ff6fa..7f754481c3839d07f57744fd1abba07d73dd3c7c 100644 (file)
--- a/src/libadmin/adminutil/NTMakefile
+++ b/src/libadmin/adminutil/NTMakefile
@@ -147,6 +147,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def afsadminutil.def
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/bos/NTMakefile b/src/libadmin/bos/NTMakefile
index d3e9d0646106c4b648fef883c080c98622acc9dd..1610a2ef49866839d7cc65082aee66088082f83c 100644 (file)
--- a/src/libadmin/bos/NTMakefile
+++ b/src/libadmin/bos/NTMakefile
@@ -46,6 +46,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def bosadmin.def
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/cfg/NTMakefile b/src/libadmin/cfg/NTMakefile
index 0867464a07a6ba690762686c718c1d683a108465..4fd146d956db84d202191e36eb597263a4e562f3 100644 (file)
--- a/src/libadmin/cfg/NTMakefile
+++ b/src/libadmin/cfg/NTMakefile
@@ -63,6 +63,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def afscfgadmin.def
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/client/NTMakefile b/src/libadmin/client/NTMakefile
index 2a7f0fdc047eee7aba0d64447ad0f05d7119e33e..3008eeb3e6c493709baeb682d23b465c564a3873 100644 (file)
--- a/src/libadmin/client/NTMakefile
+++ b/src/libadmin/client/NTMakefile
@@ -34,6 +34,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def clientadmin.def
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/kas/NTMakefile b/src/libadmin/kas/NTMakefile
index e138b6d0508c1791976d046fe2f1c0d9a9d80c87..8419e881fe4f89eb21ff1a09cd86f15a9a8fef1a 100644 (file)
--- a/src/libadmin/kas/NTMakefile
+++ b/src/libadmin/kas/NTMakefile
@@ -43,6 +43,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def kasadmin.def
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/pts/NTMakefile b/src/libadmin/pts/NTMakefile
index 1459860253fb09485500390ceaf501ef3d80f7a7..1db68b0d5680c5f9a53a6a9b8a6d4f11e56021b8 100644 (file)
--- a/src/libadmin/pts/NTMakefile
+++ b/src/libadmin/pts/NTMakefile
@@ -46,6 +46,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def ptsadmin.def
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libadmin/vos/NTMakefile b/src/libadmin/vos/NTMakefile
index 28bf5967bcccd496d0250b7cb8621f6dcf22e20f..e1e1dfad536c51dc330649d338091cf4f17a3564 100644 (file)
--- a/src/libadmin/vos/NTMakefile
+++ b/src/libadmin/vos/NTMakefile
@@ -67,6 +67,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def vosadmin.def
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp
 

diff --git a/src/libafsauthent/NTMakefile b/src/libafsauthent/NTMakefile
index 576e1cea87d987895c469fb0a5ec685fe441934f..f4f8fcca60e91d68794d16fd0bf30ea564e19936 100644 (file)
--- a/src/libafsauthent/NTMakefile
+++ b/src/libafsauthent/NTMakefile
@@ -149,6 +149,7 @@ $(LIBFILE): $(DLLOBJS) $(DLLLIBS) $(RXOBJS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def afsauthent.def
 
 # Definitions for generating versioninfo resources
 $(OUT)\afsauthent.res: AFS_component_version_number.h

diff --git a/src/libafsauthent/afsauthent.def b/src/libafsauthent/afsauthent.def
index 2e59483e22285ae87d5cc9c5b669b15b149c6014..7cb09b09f6c9d19db47c5f0b5f76b650b613be95 100644 (file)
--- a/src/libafsauthent/afsauthent.def
+++ b/src/libafsauthent/afsauthent.def
@@ -108,8 +108,8 @@ EXPORTS
         PR_UpdateEntry                                 @106
         PR_ListEntries                                 @107
         PR_ListSuperGroups                             @108
-       ka_AuthSpecificServersConn                      @109
-       ka_KeyCheckSum                                  @110
+;      ka_AuthSpecificServersConn                      @109   /* duplicate */
+;      ka_KeyCheckSum                                  @110   /* duplicate */
        rx_Finalize                                     @111
        rx_InitHost                                     @112
        VOTE_GetSyncSite                                @113

diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile
index b3a16094445d1d1838ab74982521a9bc2e77edd0..6491bb0b799d10ce9710b3feacc5efdd9223d571 100644 (file)
--- a/src/libafsrpc/NTMakefile
+++ b/src/libafsrpc/NTMakefile
@@ -99,6 +99,7 @@ $(LIBFILE): $(DLLOBJS) $(DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def afsrpc.def
 
 # Definitions for generating versioninfo resources
 $(OUT)\afsrpc.res: AFS_component_version_number.h

diff --git a/src/procmgmt/NTMakefile b/src/procmgmt/NTMakefile
index 1bab98d31917c78737a67582f13dabc1af32583d..c1571e5d5ec355ecb7dec1b25062ad25e19784a7 100644 (file)
--- a/src/procmgmt/NTMakefile
+++ b/src/procmgmt/NTMakefile
@@ -38,6 +38,7 @@ $(DLLFILE): $(DLLOBJS) $(DLLRES) $(DLLLIBS)
         $(_VC_MANIFEST_EMBED_DLL)
        $(DLLPREP)
         $(CODESIGN_USERLAND)
+       $(MAKECYGLIB) --input-def afsprocmgmt.def
        $(COPY) $*.lib $(ILIBDIR)
        $(DEL) $*.lib $*.exp