Revert "#1491 Clarified sparkle-related license"

This reverts commit 400ff8f53f.

doc/patchlevel-checklist.txt

@@ -8,8 +8,6 @@ o Update VERSION and VERSIONDATE in
   scripts/release-common.sh
   scripts/publish-mingw-x.sh
   tests/CMakeLists.txt
-o Update releases/$VERSION.md (NB! File is major version, contains patchlevel release notes)
-o scripts/makereleasenotes.sh
   
 o git tag "openscad-$VERSION"
 o ./scripts/git-archive-all.py --prefix=openscad-$VERSION/ openscad-$VERSION.src.tar.gz
@@ -20,6 +18,7 @@ o Upload Source package
 o Revert VERSION and VERSIONDATE in openscad.pro scripts/publish-macosx.sh scripts/release-common.sh scripts/publish-mingw-x.sh tests/CMakeLists.txt
 
 o Announce:
+  - ./scripts/github-release.sh $VERSION
   - Write short release email to mailing list
   - Tweet as OpenSCAD
   - Notify package managers

src/SparkleAutoUpdater.h

@@ -1,6 +1,6 @@
 /*
- *   License: MIT License (http://opensource.org/licenses/MIT)
- *   See SparkleAutoUpdater.mm
+ * Copyright (C) 2008 Remko Troncon. BSD license
+ * Copyright (C) 2013 Marius Kintel. BSD license
  */
 #pragma once
 

src/SparkleAutoUpdater.mm

@@ -1,11 +1,6 @@
 /*
- * Copyright (C) 2008 Remko Troncon.
- *   See https://github.com/remko/mixing-cocoa-and-qt
- *       https://el-tramo.be/blog/mixing-cocoa-and-qt
- *   License: BSD. Assuming 2-clause BSD reference by Sparke based on context:
- *       https://github.com/sparkle-project/Sparkle/blob/master/LICENSE
- * Copyright (C) 2013 Marius Kintel.
- *   License: MIT License (http://opensource.org/licenses/MIT)
+ * Copyright (C) 2008 Remko Troncon. BSD license
+ * Copyright (C) 2013 Marius Kintel. BSD license
  */
 
 #include "SparkleAutoUpdater.h"

tests/CMakeLists.txt

@@ -68,7 +68,6 @@ endif()
 #
 # Handle C++11.
 # Usage: cmake -DCXX11=1 .
-# Note: Since Xcode 7, c++11 is default
 #
 if (CXX11)
   message("Using C++11")
@@ -77,14 +76,9 @@ if (CXX11)
     set(LIBCXX11 1)
   endif()
 endif()
-if(APPLE)
-  if(LIBCXX11)
-    message("Using libc++")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-  else()
-    message("Using C++03 and libstdc++")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03 -stdlib=libstdc++")
-  endif()
+if(APPLE AND LIBCXX11)
+  message("Using libc++")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 endif()
 
 if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
@@ -246,7 +240,6 @@ if (NOT $ENV{BOOSTDIR} STREQUAL "")
   message(STATUS "BOOST_ROOT: " ${BOOST_ROOT})
 endif()
 
-set(Boost_DEBUG TRUE)
 find_package( Boost 1.35.0 COMPONENTS thread program_options filesystem system regex REQUIRED)
 message(STATUS "Boost ${Boost_VERSION} includes found: " ${Boost_INCLUDE_DIRS})
 message(STATUS "Boost libraries found:")
@@ -265,11 +258,7 @@ if(APPLE)
   execute_process(COMMAND grep -q __112basic_string ${Boost_LIBRARIES}
                   RESULT_VARIABLE BOOST_USE_STDLIBCPP)
   if (NOT BOOST_USE_STDLIBCPP)
-     message(STATUS "Found boost linked with libc++")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-  else()
-     message(STATUS "Found boost linked with libstdc++")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
   endif()
 endif()
 

xcode/OpenSCAD.xcodeproj/xcshareddata/xcschemes/OpenSCAD.app.xcscheme

@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -38,19 +38,16 @@
             ReferencedContainer = "container:OpenSCAD.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "YES"
       customWorkingDirectory = "$(PROJECT_DIR)/.."
+      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -80,16 +77,16 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "testdata/scad/issues/issue1472.scad -o out.echo"
-            isEnabled = "NO">
+            argument = "issue1276.scad"
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "non-manifold2.scad -o non-manifold2.stl --debug=GeometryUtils"
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "issue1443.scad"
-            isEnabled = "YES">
+            argument = "issue925.scad -o out.stl --debug=GeometryUtils"
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "testdata/scad/bugs/issue1225.scad -o out.stl --debug=export"
@@ -112,10 +109,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">