Merge pull request #3458 from peter-b/bugfix-16716

livecodeali · livecodeali · commit 645cabac644a · 2016-01-13T11:14:19.000Z
[Bug 16716] Ensure release notes are in server packages
diff --git a/buildbot.mk b/buildbot.mk
@@ -163,11 +163,11 @@ dist-server: dist-server-community
 
 dist-server-community:
 	$(buildtool_command) --platform mac --platform win --platform linux \
-	    --stage server --edition community
+	    --stage server --edition community --warn-as-error
 
 dist-server-commercial:
 	$(buildtool_command) --platform mac --platform win --platform linux \
-	    --stage server --edition commercial
+	    --stage server --edition commercial --warn-as-error
 
 ifeq ($(BUILD_EDITION),commercial)
 dist-tools: dist-tools-commercial
diff --git a/builder/builder_tool.livecodescript b/builder/builder_tool.livecodescript
@@ -164,14 +164,18 @@ end __loadExternal
 
 command __builderLog pType, pMessage
    local tLine
+
+   -- Promote builder warnings to errors, if requested
+   if pType is "warning" and sWarnAsError then
+      put "error" into pType
+   end if
    
    put toUpper(char 1 of pType) into char 1 of pType
    
    repeat for each line tLine in pMessage
       write ("[" && the internet date && "]" && ":" && pType && ":" && tLine & return) to stderr
    end repeat
-   if pType is "warning" and sWarnAsError or \
-         pType is "error" then
+   if pType is "error" then
       quit 1
    end if
 end __builderLog
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -304,7 +304,7 @@ function builderBuiltDocsFolder
 end builderBuiltDocsFolder
 
 function builderBuiltNotesFolder
-   return builderRepoFolder() & slash & "_build/notes"
+   return builderRepoFolder()
 end builderBuiltNotesFolder
 
 function builderCommercialFolder
