Final touches after personal code review. ihse-manpages-branch
authorihse
Mon, 26 Nov 2018 19:05:55 +0100
branchihse-manpages-branch
changeset 57048 b2ed864c52b5
parent 57047 d59991e5f462
child 57049 d13c49f43710
Final touches after personal code review.
make/CompileToolsJdk.gmk
make/Docs.gmk
make/common/ProcessMarkdown.gmk
make/devkit/createPandocBundle.sh
make/launcher/LauncherCommon.gmk
--- a/make/CompileToolsJdk.gmk	Mon Nov 26 18:52:33 2018 +0100
+++ b/make/CompileToolsJdk.gmk	Mon Nov 26 19:05:55 2018 +0100
@@ -108,8 +108,8 @@
 
   # Created script must be made executable
   $(PANDOC_FILTER_SETUP): $(CREATE_PANDOC_FILTER)
-		$(CHMOD) a+rx $(PANDOC_FILTER)
-		$(TOUCH) $@
+	$(CHMOD) a+rx $(PANDOC_FILTER)
+	$(TOUCH) $@
 
   TARGETS += $(PANDOC_FILTER_SETUP)
 endif
--- a/make/Docs.gmk	Mon Nov 26 18:52:33 2018 +0100
+++ b/make/Docs.gmk	Mon Nov 26 19:05:55 2018 +0100
@@ -542,7 +542,7 @@
     $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
     $(foreach d, $(SPECS_$m), \
       $(if $(filter %.md, $(call CacheFind, $d)), \
-        $(eval $m_$d_NAME := SPEC_TO_HTML_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
+        $(eval $m_$d_NAME := SPECS_TO_HTML_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
         $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
             SRC := $d, \
             FILES := $(filter %.md, $(call CacheFind, $d)), \
--- a/make/common/ProcessMarkdown.gmk	Mon Nov 26 18:52:33 2018 +0100
+++ b/make/common/ProcessMarkdown.gmk	Mon Nov 26 19:05:55 2018 +0100
@@ -170,7 +170,4 @@
       $$(eval $$(call ProcessMarkdown,$1,$$f,$$($1_SRC))) \
     )
   endif
-
-
-
 endef
--- a/make/devkit/createPandocBundle.sh	Mon Nov 26 18:52:33 2018 +0100
+++ b/make/devkit/createPandocBundle.sh	Mon Nov 26 19:05:55 2018 +0100
@@ -33,7 +33,7 @@
 cd "$TMPDIR"
 PANDOC_VERSION=2.3.1
 PACKAGE_VERSION=1.0
-TARGET_PLATFORM=macosx_x64
+TARGET_PLATFORM=linux_x64
 
 if [[ $TARGET_PLATFORM == linux_x64 ]] ; then
   PANDOC_PLATFORM=linux
--- a/make/launcher/LauncherCommon.gmk	Mon Nov 26 18:52:33 2018 +0100
+++ b/make/launcher/LauncherCommon.gmk	Mon Nov 26 19:05:55 2018 +0100
@@ -23,8 +23,8 @@
 # questions.
 #
 
+include JdkNativeCompilation.gmk
 include Modules.gmk
-include JdkNativeCompilation.gmk
 include ProcessMarkdown.gmk
 include ToolsJdk.gmk
 
@@ -193,7 +193,6 @@
   endif
 endef
 
-
 ################################################################################
 # Create man pages for jmod to pick up. There should be a one-to-one
 # relationship between executables and man pages (even if this is not always