diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-04-06 22:08:52 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-04-06 22:08:52 +0000 |
| commit | 6ea66a7770bd00dadd7b497c299dba652e3bd562 (patch) | |
| tree | 0cfa72fe80151f72e9fdde47c1e7fb3cf5299ec6 | |
| parent | 7c3867da33250e5a20d26f64c5a127323c2094cc (diff) | |
| download | lufa-6ea66a7770bd00dadd7b497c299dba652e3bd562.tar.gz lufa-6ea66a7770bd00dadd7b497c299dba652e3bd562.tar.bz2 lufa-6ea66a7770bd00dadd7b497c299dba652e3bd562.zip | |
Tweak the VSIX output names to indicate if it is a release or testing version.
| -rw-r--r-- | LUFA/StudioIntegration/lufa.xml | 2 | ||||
| -rw-r--r-- | LUFA/StudioIntegration/makefile | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/LUFA/StudioIntegration/lufa.xml b/LUFA/StudioIntegration/lufa.xml index 8b0a60df1..28afdda58 100644 --- a/LUFA/StudioIntegration/lufa.xml +++ b/LUFA/StudioIntegration/lufa.xml @@ -15,7 +15,7 @@ <description>Lightweight USB Framework for AVRs (LUFA), a USB software stack/framework.</description>
<icon-image path="LUFA/DoxygenPages/Images/LUFA_thumb.png"/>
<preview-image path="LUFA/DoxygenPages/Images/LUFA.png"/>
- <license caption="LUFA license" path="LUFA/License.txt"/>
+ <license caption="LUFA License" path="LUFA/License.txt"/>
<release-notes caption="LUFA Information" url="http://www.lufa-lib.org"/>
<online-help>
<index-page caption="LUFA Documentation" url="http://www.lufa-lib.org/documentation/"/>
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile index b96f4013a..6d24815b0 100644 --- a/LUFA/StudioIntegration/makefile +++ b/LUFA/StudioIntegration/makefile @@ -16,10 +16,13 @@ EXTENSION_OUTPUT_XML := $(LUFA_ROOT)/../extension.xml MODULE_OUTPUT_XML := $(LUFA_ROOT)/asf.xml XML_FILES := $(filter-out $(TEMP_MANIFEST_FILE), $(shell ls *.xml)) LUFA_VERSION_NUM := $(shell grep LUFA_VERSION_STRING $(LUFA_ROOT)/Version.h | cut -d'"' -f2) -EXT_VERSION_NUM := $(shell date +"%y.%m.%d").$(LUFA_VERSION_NUM) -ifeq ($(LUFA_VERSION_NUM),000000) +ifneq ($(LUFA_VERSION_NUM),000000) + EXT_VERSION_NUM := $(shell date +"%y.%m.%d").$(LUFA_VERSION_NUM) + EXT_VSIX_NAME := LUFA-RELEASE-$(LUFA_VERSION_NUM).vsix +else EXT_VERSION_NUM := 0.$(shell date +"%y%m%d.%H%M%S") + EXT_VSIX_NAME := LUFA-TESTING-$(shell date +"%y.%m.%d.%H.%M.%S").vsix $(warning No LUFA version set - assuming a test version should be created.) endif @@ -72,7 +75,7 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML) @xsltproc --stringparam lufa-version "$(LUFA_VERSION_NUM)" XSLT/lufa_asfmanifest_transform.xslt VSIX/asf-manifest.xml > $(LUFA_ROOT)/../asf-manifest.xml @echo "Generating Atmel Studio VSIX Extension file..." - @cd $(LUFA_ROOT)/../ && zip LUFA-$(LUFA_VERSION_NUM).vsix -q -9 contents.zip exampleProjects.xml content.xml.cache License.txt Preview.png PreviewThumb.png "[Content_Types].xml" extension.vsixmanifest asf-manifest.xml extension.xml + @cd $(LUFA_ROOT)/../ && zip $(EXT_VSIX_NAME) -q -9 contents.zip exampleProjects.xml content.xml.cache License.txt Preview.png PreviewThumb.png "[Content_Types].xml" extension.vsixmanifest asf-manifest.xml extension.xml @echo "Atmel Studio VSIX Extension file generated." check_filenames: $(MODULE_OUTPUT_XML) |