v1.4.4

scripts/osx/build.command

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd "$(dirname $0)/../.."
+
+cd build
+make -j3

scripts/osx/copy-to-steam.sh

@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+cd "`dirname \"$0\"`/../../dist"
+
+STEAM_INSTALL_DIR="$HOME/Library/Application Support/Steam/steamapps/common/Starbound - Unstable"
+
+./asset_packer -c ../scripts/packing.config ../assets/packed ./packed.pak
+mv packed.pak "$STEAM_INSTALL_DIR/assets/packed.pak"
+cp starbound "$STEAM_INSTALL_DIR/osx/Starbound.app/Contents/MacOS/"

scripts/osx/launch-steam.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+cd "`dirname \"$0\"`/../../dist"
+
+cp ../scripts/steam_appid.txt .
+
+DYLD_INSERT_LIBRARIES=~/Library/Application\ Support/Steam/Steam.AppBundle/Steam/Contents/MacOS/gameoverlayrenderer.dylib DYLD_LIBRARY_PATH=../lib/osx/ $@

scripts/osx/run.command

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd "$(dirname $0)/../.."
+
+cd dist
+./starbound

scripts/osx/sbinit.config

@@ -0,0 +1,23 @@
+{
+  "assetDirectories" : [
+    "../assets/",
+    "./mods/"
+  ],
+
+  "storageDirectory" : "./",
+
+  "assetsSettings" : {
+    "pathIgnore" : [],
+    "digestIgnore" : [
+      ".*"
+    ]
+  },
+
+  "defaultConfiguration" : {
+    "allowAdminCommandsFromAnyone" : true,
+    "anonymousConnectionsAreAdmin" : true,
+    "bindings" : {
+      "KeybindingClear" :  [ { "type" : "key", "value" : "Del", "mods" : [] } ]
+    }
+  }
+}

scripts/osx/setup.command

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cd "$(dirname $0)/../.."
+
+mkdir -p dist
+cp scripts/osx/sbinit.config dist/
+
+mkdir -p build
+cd build
+
+CC=clang CXX=clang++ /Applications/CMake.app/Contents/bin/cmake \
+  -DCMAKE_EXPORT_COMPILE_COMMANDS=true \
+  -DCMAKE_BUILD_TYPE=RelWithAsserts \
+  -DSTAR_USE_JEMALLOC=ON \
+  -DCMAKE_INCLUDE_PATH=../lib/osx/include \
+  -DCMAKE_LIBRARY_PATH=../lib/osx/ \
+  ../source

scripts/osx/setup.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+cd "`dirname \"$0\"`/../.."
+
+mkdir -p dist
+cp scripts/osx/sbinit.config dist/
+
+mkdir -p build
+cd build
+
+QT5_INSTALL_PATH=/usr/local/opt/qt5
+if [ -d $QT5_INSTALL_PATH ]; then
+  export PATH=$QT5_INSTALL_PATH/bin:$PATH
+  export LDFLAGS=-L$QT5_INSTALL_PATH/lib
+  export CPPFLAGS=-I$QT5_INSTALL_PATH/include
+  export CMAKE_PREFIX_PATH=$QT5_INSTALL_PATH
+  BUILD_QT_TOOLS=ON
+else
+  BUILD_QT_TOOLS=OFF
+fi
+
+CC=clang CXX=clang++ cmake \
+  -DCMAKE_EXPORT_COMPILE_COMMANDS=true \
+  -DCMAKE_BUILD_TYPE=RelWithAsserts \
+  -DSTAR_BUILD_QT_TOOLS=$BUILD_QT_TOOLS \
+  -DSTAR_USE_JEMALLOC=ON \
+  -DCMAKE_INCLUDE_PATH=../lib/osx/include \
+  -DCMAKE_LIBRARY_PATH=../lib/osx/ \
+  ../source

scripts/osx/ycm_extra_conf.py

@@ -0,0 +1,160 @@
+# This file is NOT licensed under the GPLv3, which is the license for the rest
+# of YouCompleteMe.
+#
+# Here's the license text for this file:
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# For more information, please refer to <http://unlicense.org/>
+
+import os
+import ycm_core
+
+# These are the compilation flags that will be used in case there's no
+# compilation database set (by default, one is not set).
+# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR.
+flags = [
+'-Wall',
+'-Wextra',
+'-Werror',
+'-fexceptions',
+'-DNDEBUG',
+# THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which
+# language to use when compiling headers. So it will guess. Badly. So C++
+# headers will be compiled as C headers. You don't want that so ALWAYS specify
+# a "-std=<something>".
+# For a C project, you would set this to something like 'c99' instead of
+# 'c++11'.
+'-std=c++14',
+'-stdlib=libc++',
+# ...and the same thing goes for the magic -x option which specifies the
+# language that the files to be compiled are written in. This is mostly
+# relevant for c++ headers.
+# For a C project, you would set this to 'c' instead of 'c++'.
+'-x', 'c++'
+]
+
+
+# Set this to the absolute path to the folder (NOT the file!) containing the
+# compile_commands.json file to use that instead of 'flags'. See here for
+# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
+#
+# You can get CMake to generate this file for you by adding:
+#   set( CMAKE_EXPORT_COMPILE_COMMANDS 1 )
+# to your CMakeLists.txt file.
+#
+# Most projects will NOT need to set this to anything; you can just change the
+# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
+compilation_database_folder = '/Users/catherine/Documents/starbound/build'
+
+if os.path.exists( compilation_database_folder ):
+  database = ycm_core.CompilationDatabase( compilation_database_folder )
+else:
+  database = None
+
+SOURCE_EXTENSIONS = [ '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
+
+def DirectoryOfThisScript():
+  return os.path.dirname( os.path.abspath( __file__ ) )
+
+
+def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
+  if not working_directory:
+    return list( flags )
+  new_flags = []
+  make_next_absolute = False
+  path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
+  for flag in flags:
+    new_flag = flag
+
+    if make_next_absolute:
+      make_next_absolute = False
+      if not flag.startswith( '/' ):
+        new_flag = os.path.join( working_directory, flag )
+
+    for path_flag in path_flags:
+      if flag == path_flag:
+        make_next_absolute = True
+        break
+
+      if flag.startswith( path_flag ):
+        path = flag[ len( path_flag ): ]
+        new_flag = path_flag + os.path.join( working_directory, path )
+        break
+
+    if new_flag:
+      new_flags.append( new_flag )
+  return new_flags
+
+
+def IsHeaderFile( filename ):
+  extension = os.path.splitext( filename )[ 1 ]
+  return extension in [ '.h', '.hxx', '.hpp', '.hh' ]
+
+
+def GetCompilationInfoForFile( filename ):
+  # The compilation_commands.json file generated by CMake does not have entries
+  # for header files. So we do our best by asking the db for flags for a
+  # corresponding source file, if any. If one exists, the flags for that file
+  # should be good enough.
+  if IsHeaderFile( filename ):
+    basename = os.path.splitext( filename )[ 0 ]
+    for extension in SOURCE_EXTENSIONS:
+      replacement_file = basename + extension
+      if os.path.exists( replacement_file ):
+        compilation_info = database.GetCompilationInfoForFile(
+          replacement_file )
+        if compilation_info.compiler_flags_:
+          return compilation_info
+    return None
+  return database.GetCompilationInfoForFile( filename )
+
+
+def FlagsForFile( filename, **kwargs ):
+  if database:
+    # Bear in mind that compilation_info.compiler_flags_ does NOT return a
+    # python list, but a "list-like" StringVec object
+    compilation_info = GetCompilationInfoForFile( filename )
+    if not compilation_info:
+      return None
+
+    final_flags = MakeRelativePathsInFlagsAbsolute(
+      compilation_info.compiler_flags_,
+      compilation_info.compiler_working_dir_ )
+
+  else:
+    relative_to = DirectoryOfThisScript()
+    final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
+
+  # Workaround for clang bug regarding default paths in compiling from
+  # libclang.so vs the clang binary
+  final_flags.extend([
+      "-isystem/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/",
+      "-isystem/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/7.0.2/include"
+    ])
+  
+  return {
+    'flags': final_flags,
+    'do_cache': True
+  }