From b82e18781b471a152869a2ca895056c7fe68cdd2 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Tue, 26 Jul 2016 18:27:01 -0700 Subject: [PATCH] Add some stuff for version tracking as well as archival --- .gitignore | 1 + Makefile | 12 +++++++++++- SFDashC/main.go | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c7263c0..f8208de 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ docs.min.css holygrail.min.css syntax-highlighter.min.css *-version.txt +*.tgz diff --git a/Makefile b/Makefile index 8fc0f15..c7d3fdc 100644 --- a/Makefile +++ b/Makefile @@ -14,22 +14,26 @@ run-combined: package-apex: $(eval type = Apex) $(eval package = Salesforce $(type).docset) + $(eval version = $(shell cat SFDashC/$(shell echo $(type)| tr A-Z a-z)-version.txt)) mkdir -p "$(package)/Contents/Resources/Documents" cp -r SFDashC/atlas.en-us.apexcode.meta "$(package)/Contents/Resources/Documents/" cp SFDashC/*.html "$(package)/Contents/Resources/Documents/" cp SFDashC/*.css "$(package)/Contents/Resources/Documents/" cp SFDashC/Info-$(type).plist "$(package)/Contents/Info.plist" cp SFDashC/docSet.dsidx "$(package)/Contents/Resources/" + @echo "Docset generated!" package-vf: $(eval type = Pages) $(eval package = Salesforce $(type).docset) + $(eval version = $(shell cat SFDashC/$(shell echo $(type)| tr A-Z a-z)-version.txt)) mkdir -p "$(package)/Contents/Resources/Documents" cp -r SFDashC/atlas.en-us.pages.meta "$(package)/Contents/Resources/Documents/" cp SFDashC/*.html "$(package)/Contents/Resources/Documents/" cp SFDashC/*.css "$(package)/Contents/Resources/Documents/" cp SFDashC/Info-$(type).plist "$(package)/Contents/Info.plist" cp SFDashC/docSet.dsidx "$(package)/Contents/Resources/" + @echo "Docset generated!" package-combined: $(eval type = Combined) @@ -40,11 +44,17 @@ package-combined: cp SFDashC/*.css "$(package)/Contents/Resources/Documents/" cp SFDashC/Info-$(type).plist "$(package)/Contents/Info.plist" cp SFDashC/docSet.dsidx "$(package)/Contents/Resources/" + @echo "Docset generated!" + +archive: + find *.docset -depth 0 | xargs -I '{}' sh -c 'tar --exclude=".DS_Store" -czf "$$(echo {} | sed "s/\.[^.]*$$//").tgz" "{}"' + @echo "Archives created!" clean-index: rm -f SFDashC/docSet.dsidx clean: clean-index rm -fr SFDashC/*.meta - rm -f SFDashC/*.css rm -fr *.docset + rm -f SFDashC/*.css + rm -f *.tgz diff --git a/SFDashC/main.go b/SFDashC/main.go index 01e91d2..8858ce9 100644 --- a/SFDashC/main.go +++ b/SFDashC/main.go @@ -70,7 +70,7 @@ func verifyVersion(toc *AtlasTOC) error { } func printSuccess(toc *AtlasTOC) { - fmt.Println("Success:", toc.DocTitle, "-", toc.Version.VersionText) + fmt.Println("Success:", toc.DocTitle, "-", toc.Version.VersionText, "-", toc.Version.DocVersion) } func saveMainContent(toc *AtlasTOC) {