diff options
author | Nick Wellnhofer <wellnhofer@aevum.de> | 2023-04-28 15:34:09 +0200 |
---|---|---|
committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2023-05-06 16:33:11 +0200 |
commit | a24687ea5203dbd6373a99a04302bea5e09e77fa (patch) | |
tree | 7a188f82fafab15bf0669eec59a324bef8662083 | |
parent | 7d4462fb044e5be0d0529f513f6893276e46bd47 (diff) | |
download | libxslt-a24687ea5203dbd6373a99a04302bea5e09e77fa.tar.gz |
win32: Remove broken libxslt.def.src
-rw-r--r-- | doc/Makefile.am | 4 | ||||
-rw-r--r-- | win32/Makefile.msvc | 26 | ||||
-rw-r--r-- | win32/defgen.xsl | 44 | ||||
-rw-r--r-- | win32/libexslt.def.src | 20 | ||||
-rw-r--r-- | win32/libxslt.def.src | 262 |
5 files changed, 2 insertions, 354 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 95d70277..25bff8ca 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -40,10 +40,6 @@ rebuild: cd $(srcdir) && ./apibuild.py cd $(srcdir) && $(XSLTPROC) --nonet xsltproc.xml cd $(srcdir) && $(XSLTPROC) --nonet -o xsltproc.html $(DOCBOOK_HTML) xsltproc.xml - cd $(srcdir) && $(XSLTPROC) -o $(WIN32_DIR)/libxslt.def.src \ - --nonet $(WIN32_DIR)/defgen.xsl libxslt-api.xml - cd $(srcdir) && $(XSLTPROC) -o $(WIN32_DIR)/libexslt.def.src \ - --nonet $(WIN32_DIR)/defgen.xsl EXSLT/libexslt-api.xml cd devhelp && $(MAKE) rebuild cd EXSLT/devhelp && $(MAKE) rebuild diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 1f876684..5582afcf 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -29,13 +29,11 @@ XSLT_NAME = xslt XSLT_BASENAME = lib$(XSLT_NAME) XSLT_SO = $(XSLT_BASENAME).dll XSLT_IMP = $(XSLT_BASENAME).lib -XSLT_DEF = $(XSLT_BASENAME).def XSLT_A = $(XSLT_BASENAME)_a.lib EXSLT_NAME = exslt EXSLT_BASENAME = lib$(EXSLT_NAME) EXSLT_SO = $(EXSLT_BASENAME).dll EXSLT_IMP = $(EXSLT_BASENAME).lib -EXSLT_DEF = $(EXSLT_BASENAME).def EXSLT_A = $(EXSLT_BASENAME)_a.lib # Places where intermediate files produced by the compiler go @@ -238,24 +236,14 @@ $(XSLT_OBJS) : $(XSLT_INTDIR) # Compiles static libxslt source. Uses the implicit rule for commands. $(XSLT_OBJS_A) : $(XSLT_INTDIR_A) -# Creates the export definition file (DEF) for libxslt. -$(XSLT_INTDIR)\$(XSLT_DEF) : $(XSLT_INTDIR) $(XSLT_DEF).src - $(CPP) $(CPPFLAGS) $(XSLT_DEF).src > $(XSLT_INTDIR)\$(XSLT_DEF) - # Creates the libxslt shared object. -$(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS) $(XSLT_INTDIR)\$(XSLT_DEF) +$(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS) $(LD) $(LDFLAGS) /DLL \ /VERSION:$(LIBXSLT_MAJOR_VERSION).$(LIBXSLT_MINOR_VERSION) \ /IMPLIB:$(BINDIR)\$(XSLT_IMP) /OUT:$(BINDIR)\$(XSLT_SO) \ $(XSLT_OBJS) $(LIBS) libxml2.lib @$(_VC_MANIFEST_EMBED_DLL) -#$(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS) $(XSLT_INTDIR)\$(XSLT_DEF) -# $(LD) $(LDFLAGS) /DLL /DEF:$(XSLT_INTDIR)\$(XSLT_DEF) \ -# /VERSION:$(LIBXSLT_MAJOR_VERSION).$(LIBXSLT_MINOR_VERSION) \ -# /IMPLIB:$(BINDIR)\$(XSLT_IMP) /OUT:$(BINDIR)\$(XSLT_SO) \ -# $(XSLT_OBJS) $(LIBS) libxml2.lib - # Creates the libxslt archive. $(BINDIR)\$(XSLT_A) : $(BINDIR) $(XSLT_OBJS_A) $(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(XSLT_A) $(XSLT_OBJS_A) @@ -284,24 +272,14 @@ $(EXSLT_OBJS) : $(EXSLT_INTDIR) # Compiles libxslt source. Uses the implicit rule for commands. $(EXSLT_OBJS_A) : $(EXSLT_INTDIR_A) -# Creates the export definition file (DEF) for libxslt. -$(EXSLT_INTDIR)\$(EXSLT_DEF) : $(EXSLT_INTDIR) $(EXSLT_DEF).src - $(CPP) $(CPPFLAGS) $(EXSLT_DEF).src > $(EXSLT_INTDIR)\$(EXSLT_DEF) - # Creates the libexslt shared object. -$(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) $(EXSLT_INTDIR)\$(EXSLT_DEF) libxslt +$(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) libxslt $(LD) $(LDFLAGS) /DLL \ /VERSION:$(LIBEXSLT_MAJOR_VERSION).$(LIBEXSLT_MINOR_VERSION) \ /IMPLIB:$(BINDIR)\$(EXSLT_IMP) /OUT:$(BINDIR)\$(EXSLT_SO) \ $(EXSLT_OBJS) $(XSLT_IMP) $(LIBS) libxml2.lib @$(_VC_MANIFEST_EMBED_DLL) -#$(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) $(EXSLT_INTDIR)\$(EXSLT_DEF) libxslt -# $(LD) $(LDFLAGS) /DLL /DEF:$(EXSLT_INTDIR)\$(EXSLT_DEF) \ -# /VERSION:$(LIBEXSLT_MAJOR_VERSION).$(LIBEXSLT_MINOR_VERSION) \ -# /IMPLIB:$(BINDIR)\$(EXSLT_IMP) /OUT:$(BINDIR)\$(EXSLT_SO) \ -# $(EXSLT_OBJS) $(XSLT_IMP) $(LIBS) libxml2.lib - # Creates the libexslt archive. $(BINDIR)\$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta $(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(EXSLT_A) $(EXSLT_OBJS_A) diff --git a/win32/defgen.xsl b/win32/defgen.xsl deleted file mode 100644 index 6a295374..00000000 --- a/win32/defgen.xsl +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0"?> -<!-- - win32/defgen.xsl - This stylesheet is used to transform doc/lib[e]xslt-api.xml into a pseudo-source, - which can then be preprocessed to get the .DEF file for the Microsoft's linker. - - Use any XSLT processor to produce a file called lib[e]xslt.def.src in the win32 - subdirectory, for example, run xsltproc from the win32 subdirectory: - - xsltproc -o libxslt.def.src defgen.xsl ../doc/libxslt-api.xml - xsltproc -o libexslt.def.src defgen.xsl ../doc/libexslt-api.xml - - Once that finishes, rest assured, the Makefile will know what to do with the - generated file. - - May 2003, Igor Zlatkovic <igor@zlatkovic.com> ---> -<!DOCTYPE xsl:stylesheet [ <!ENTITY nl '
'> ]> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - <xsl:strip-space elements="*"/> - <xsl:output method="text"/> - <xsl:template match="/"> - <xsl:text>LIBRARY </xsl:text> - <xsl:value-of select="/api/@name"/> - <xsl:text>&nl;</xsl:text> - <xsl:text>EXPORTS&nl;</xsl:text> - <xsl:for-each select="/api/symbols/*[self::variable or self::function]"> - <xsl:if test="@name='xsltExtFunctionLookup' or - @name='xsltMatchPattern'"> - <xsl:text>/*</xsl:text> - </xsl:if> - <xsl:value-of select="@name"/> - <xsl:if test="self::variable"> - <xsl:text> DATA</xsl:text> - </xsl:if> - <xsl:if test="@name='xsltExtFunctionLookup' or - @name='xsltMatchPattern'"> - <xsl:text>*/</xsl:text> - </xsl:if> - <xsl:text>&nl;</xsl:text> - </xsl:for-each> - </xsl:template> -</xsl:stylesheet> - diff --git a/win32/libexslt.def.src b/win32/libexslt.def.src deleted file mode 100644 index cb02e028..00000000 --- a/win32/libexslt.def.src +++ /dev/null @@ -1,20 +0,0 @@ -LIBRARY libexslt -EXPORTS -exsltLibexsltVersion DATA -exsltLibraryVersion DATA -exsltLibxmlVersion DATA -exsltLibxsltVersion DATA -exsltCommonRegister -exsltCryptoRegister -exsltDateRegister -exsltDateXpathCtxtRegister -exsltDynRegister -exsltFuncRegister -exsltMathRegister -exsltMathXpathCtxtRegister -exsltRegisterAll -exsltSaxonRegister -exsltSetsRegister -exsltSetsXpathCtxtRegister -exsltStrRegister -exsltStrXpathCtxtRegister diff --git a/win32/libxslt.def.src b/win32/libxslt.def.src deleted file mode 100644 index b4846a6b..00000000 --- a/win32/libxslt.def.src +++ /dev/null @@ -1,262 +0,0 @@ -LIBRARY libxslt -EXPORTS -xslDebugStatus DATA -xsltConstNamespaceNameXSLT DATA -xsltDocDefaultLoader DATA -xsltEngineVersion DATA -xsltExtMarker DATA -xsltGenericDebug DATA -xsltGenericDebugContext DATA -xsltGenericError DATA -xsltGenericErrorContext DATA -xsltLibxmlVersion DATA -xsltLibxsltVersion DATA -xsltMaxDepth DATA -xsltMaxVars DATA -xsltXSLTAttrMarker DATA -xslAddCall -xslDropCall -xslHandleDebugger -xsltAddKey -xsltAddStackElemList -xsltAddTemplate -xsltAllocateExtra -xsltAllocateExtraCtxt -xsltApplyAttributeSet -xsltApplyImports -xsltApplyOneTemplate -xsltApplyStripSpaces -xsltApplyStylesheet -xsltApplyStylesheetUser -xsltApplyTemplates -xsltAttrListTemplateProcess -xsltAttrTemplateProcess -xsltAttrTemplateValueProcess -xsltAttrTemplateValueProcessNode -xsltAttribute -xsltCalibrateAdjust -xsltCallTemplate -xsltCheckExtPrefix -xsltCheckExtURI -xsltCheckRead -xsltCheckWrite -xsltChoose -xsltCleanupGlobals -xsltCleanupTemplates -xsltComment -xsltCompMatchClearCache -xsltCompileAttr -xsltCompilePattern -xsltComputeSortResult -xsltCopy -xsltCopyNamespace -xsltCopyNamespaceList -xsltCopyOf -xsltCopyTextString -xsltCreateRVT -xsltDebug -xsltDebugDumpExtensions -xsltDebugGetDefaultTrace -xsltDebugSetDefaultTrace -xsltDecimalFormatGetByName -xsltDecimalFormatGetByQName -xsltDefaultSortFunction -xsltDoSortFunction -xsltDocumentComp -xsltDocumentElem -xsltDocumentFunction -xsltDocumentSortFunction -xsltElement -xsltElementAvailableFunction -xsltEvalAVT -xsltEvalAttrValueTemplate -xsltEvalGlobalVariables -xsltEvalOneUserParam -xsltEvalStaticAttrValueTemplate -xsltEvalTemplateString -xsltEvalUserParams -xsltEvalXPathPredicate -xsltEvalXPathString -xsltEvalXPathStringNs -xsltExtElementLookup -xsltExtModuleElementLookup -xsltExtModuleElementPreComputeLookup -xsltExtModuleFunctionLookup -xsltExtModuleTopLevelLookup -xsltExtensionInstructionResultFinalize -xsltExtensionInstructionResultRegister -xsltFindDocument -xsltFindElemSpaceHandling -xsltFindTemplate -xsltFlagRVTs -xsltForEach -xsltFormatNumberConversion -xsltFormatNumberFunction -xsltFreeAVTList -xsltFreeAttributeSetsHashes -xsltFreeCompMatchList -xsltFreeCtxtExts -xsltFreeDocumentKeys -xsltFreeDocuments -xsltFreeExts -xsltFreeGlobalVariables -xsltFreeKeys -xsltFreeLocale -xsltFreeLocales -xsltFreeNamespaceAliasHashes -xsltFreeRVTs -xsltFreeSecurityPrefs -xsltFreeStackElemList -xsltFreeStyleDocuments -xsltFreeStylePreComps -xsltFreeStylesheet -xsltFreeTemplateHashes -xsltFreeTransformContext -xsltFunctionAvailableFunction -xsltFunctionNodeSet -xsltGenerateIdFunction -xsltGetCNsProp -xsltGetDebuggerStatus -xsltGetDefaultSecurityPrefs -xsltGetExtData -xsltGetExtInfo -xsltGetKey -xsltGetNamespace -xsltGetNsProp -xsltGetPlainNamespace -xsltGetProfileInformation -xsltGetQNameURI -xsltGetQNameURI2 -xsltGetSecurityPrefs -xsltGetSpecialNamespace -xsltGetTemplate -xsltGetUTF8Char -xsltGetXIncludeDefault -xsltIf -xsltInit -xsltInitAllDocKeys -xsltInitCtxtExts -xsltInitCtxtKey -xsltInitCtxtKeys -xsltInitElemPreComp -xsltInitGlobals -xsltIsBlank -xsltKeyFunction -xsltLoadDocument -xsltLoadStyleDocument -xsltLoadStylesheetPI -xsltLocalVariablePop -xsltLocalVariablePush -xsltLocaleStrcmp -/*xsltMatchPattern*/ -xsltMessage -xsltNamespaceAlias -xsltNeedElemSpaceHandling -xsltNewDocument -xsltNewElemPreComp -xsltNewLocale -xsltNewSecurityPrefs -xsltNewStyleDocument -xsltNewStylesheet -xsltNewTransformContext -xsltNextImport -xsltNormalizeCompSteps -xsltNumber -xsltNumberFormat -xsltParseAnyXSLTElem -xsltParseGlobalParam -xsltParseGlobalVariable -xsltParseSequenceConstructor -xsltParseStylesheetAttributeSet -xsltParseStylesheetCallerParam -xsltParseStylesheetDoc -xsltParseStylesheetFile -xsltParseStylesheetImport -xsltParseStylesheetImportedDoc -xsltParseStylesheetInclude -xsltParseStylesheetOutput -xsltParseStylesheetParam -xsltParseStylesheetProcess -xsltParseStylesheetUser -xsltParseStylesheetVariable -xsltParseTemplateContent -xsltPointerListAddSize -xsltPointerListClear -xsltPointerListCreate -xsltPointerListFree -xsltPreComputeExtModuleElement -xsltPrintErrorContext -xsltProcessOneNode -xsltProcessingInstruction -xsltProfileStylesheet -xsltQuoteOneUserParam -xsltQuoteUserParams -xsltRegisterAllElement -xsltRegisterAllExtras -xsltRegisterAllFunctions -xsltRegisterExtElement -xsltRegisterExtFunction -xsltRegisterExtModule -xsltRegisterExtModuleElement -xsltRegisterExtModuleFull -xsltRegisterExtModuleFunction -xsltRegisterExtModuleTopLevel -xsltRegisterExtPrefix -xsltRegisterExtras -xsltRegisterLocalRVT -xsltRegisterPersistRVT -xsltRegisterTestModule -xsltRegisterTmpRVT -xsltReleaseRVT -xsltResolveStylesheetAttributeSet -xsltRestoreDocumentNamespaces -xsltRunStylesheet -xsltRunStylesheetUser -xsltSaveProfiling -xsltSaveResultTo -xsltSaveResultToFd -xsltSaveResultToFile -xsltSaveResultToFilename -xsltSaveResultToString -xsltSecurityAllow -xsltSecurityForbid -xsltSetCtxtParseOptions -xsltSetCtxtSecurityPrefs -xsltSetCtxtSortFunc -xsltSetDebuggerCallbacks -xsltSetDebuggerStatus -xsltSetDefaultSecurityPrefs -xsltSetGenericDebugFunc -xsltSetGenericErrorFunc -xsltSetLoaderFunc -xsltSetSecurityPrefs -xsltSetSortFunc -xsltSetTransformErrorFunc -xsltSetXIncludeDefault -xsltShutdownCtxtExts -xsltShutdownExts -xsltSort -xsltSplitQName -xsltStrxfrm -xsltStyleGetExtData -xsltStylePreCompute -xsltStyleStylesheetLevelGetExtData -xsltSystemPropertyFunction -xsltTemplateProcess -xsltTestCompMatchList -xsltText -xsltTimestamp -xsltTransformError -xsltUninit -xsltUnparsedEntityURIFunction -xsltUnregisterExtModule -xsltUnregisterExtModuleElement -xsltUnregisterExtModuleFunction -xsltUnregisterExtModuleTopLevel -xsltValueOf -xsltVariableLookup -xsltXPathCompile -xsltXPathCompileFlags -xsltXPathFunctionLookup -xsltXPathGetTransformContext -xsltXPathVariableLookup |