Remove redundant XSL params from the Studio Integration makefile.

[pub/USBasp.git] / LUFA / StudioIntegration / makefile

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 3227997..fc11ce8 100644 (file)
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -29,22 +29,24 @@ EXTENSION_OUTPUT_XML := $(LUFA_ROOT)/../extension.xml
 MODULE_OUTPUT_XML    := $(LUFA_ROOT)/asf.xml
 MSHELP_OUTPUT_XML    := $(LUFA_ROOT)/../lufa_help_$(EXT_VERSION_NUM).mshc
 XML_FILES            := $(filter-out $(TEMP_MANIFEST_FILE), $(shell ls *.xml))
 MODULE_OUTPUT_XML    := $(LUFA_ROOT)/asf.xml
 MSHELP_OUTPUT_XML    := $(LUFA_ROOT)/../lufa_help_$(EXT_VERSION_NUM).mshc
 XML_FILES            := $(filter-out $(TEMP_MANIFEST_FILE), $(shell ls *.xml))

-VSIX_ASSETS          := $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png \
-                        $(LUFA_ROOT)/DoxygenPages/Images/LUFA.png       \
-                        $(LUFA_ROOT)/License.txt                        \
-                        VSIX/"[Content_Types].xml"                      \
-                        VSIX/ASFExplorer.png                            \
-                        VSIX/ASFWizard.png                              \
-                        VSIX/NewExampleWizard.png                       \
-                        VSIX/GettingStarted.htm                         \
-                        Blob/Atmel.Studio.Services.Interfaces.dll       \
-                        Blob/LUFA.dll                                   \
+VSIX_ASSETS          := $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png    \
+                        $(LUFA_ROOT)/DoxygenPages/Images/LUFA.png          \
+                        $(LUFA_ROOT)/License.txt                           \
+                        VSIX/"[Content_Types].xml"                         \
+                        VSIX/ASFExplorer.png                               \
+                        VSIX/ASFWizard.png                                 \
+                        VSIX/LUFAHelpMenu.png                              \
+                        VSIX/NewExampleWizard.png                          \
+                        VSIX/GettingStarted.htm                            \
+                        Blob/LUFA.dll                                      \

                         Blob/LUFA.pkgdef
                         Blob/LUFA.pkgdef

-
-MSHELP_GEN_PARAMS   := --stringparam generate.toc "book toc"            \
-                       --stringparam chunk.quietly "1"                  \
-                       --stringparam chunk.section.depth "3"            \
-                       --stringparam chunk.first.sections "1"
+MSHELP_GEN_PARAMS   := --stringparam generate.toc "book toc"               \
+                       --stringparam chunk.quietly "1"                     \
+                       --stringparam chunk.section.depth "3"               \
+                       --stringparam chunk.first.sections "1"              \
+                       --stringparam chapter.autolabel "0"                 \
+                       --stringparam root.filename "LUFA"                  \
+                       --stringparam html.stylesheet "lufa_studio_help_styling.css"

 
 all: generate_xml check_filenames generate_vsix
 
 
 all: generate_xml check_filenames generate_vsix
 


@@ -83,15 +85,18 @@ $(EXTENSION_OUTPUT_XML): $(TEMP_MANIFEST_XML)
 $(MSHELP_OUTPUT_XML): $(DOXYGEN_COMBINED_XML)
        @echo Converting Doxygen XML to Docbook...
        @-mkdir mshelp 2> /dev/null
 $(MSHELP_OUTPUT_XML): $(DOXYGEN_COMBINED_XML)
        @echo Converting Doxygen XML to Docbook...
        @-mkdir mshelp 2> /dev/null

-       @xsltproc HV1/lufa_docbook_transform.xsl $(DOXYGEN_COMBINED_XML) > mshelp/lufa_docbook.xml
-       @cd mshelp && xsltproc $(MSHELP_GEN_PARAMS) ../Docbook/mshelp/docbook.xsl lufa_docbook.xml
+       @xsltproc HV1/lufa_docbook_transform.xslt $(DOXYGEN_COMBINED_XML) > mshelp/lufa_docbook.xml
+
+       @echo Converting Docbook XML to Microsoft Help 1.0...
+       @cd mshelp && xsltproc $(MSHELP_GEN_PARAMS) ../HV1/lufa_hv1_transform.xslt lufa_docbook.xml

 
        @echo Copying help assets...
 
        @echo Copying help assets...

+       @cp HV1/lufa_studio_help_styling.css mshelp

        @-mkdir mshelp/images 2> /dev/null
        @cp `find $(LUFA_ROOT)/DoxygenPages/Images -type f` mshelp/images
 
        @echo Archiving help content...
        @-mkdir mshelp/images 2> /dev/null
        @cp `find $(LUFA_ROOT)/DoxygenPages/Images -type f` mshelp/images
 
        @echo Archiving help content...

-       @cd mshelp && zip ../$(MSHELP_OUTPUT_XML) -q -0  -r *.html images
+       @cd mshelp && zip ../$(MSHELP_OUTPUT_XML) -q -0  -r *.html *.css images

 
 
 generate_xml: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
 
 
 generate_xml: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)