Merge pull request #27 from danielga/add-support-for-new-build-system

Add support for new build system
Improved premake5 script
Updated license and README with new links

Author: danielga

.appveyor.yml

@@ -10,25 +10,21 @@ environment:
   DEPENDENCIES: $(APPVEYOR_BUILD_FOLDER)/dependencies
   GARRYSMOD_COMMON: $(APPVEYOR_BUILD_FOLDER)/dependencies/garrysmod_common
   SOURCE_SDK: $(APPVEYOR_BUILD_FOLDER)/dependencies/sourcesdk-minimal
+  PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-windows.zip
   PREMAKE5_EXECUTABLE: premake5.exe
   PREMAKE5: $(APPVEYOR_BUILD_FOLDER)/dependencies/windows/premake-core/premake5.exe
-  BUILD_SCRIPT: $(APPVEYOR_BUILD_FOLDER)/dependencies/garrysmod_common/build/ci.ps1
+  BUILD_SCRIPT: $(APPVEYOR_BUILD_FOLDER)/dependencies/garrysmod_common/build/build.ps1
   GARRYSMOD_COMMON_REPOSITORY: https://github.com/danielga/garrysmod_common.git
+  BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.ps1
   PROJECT_OS: windows
   TARGET_OS: win32
   COMPILER_PLATFORM: vs2017
 install:
-- cmd: >-
-    if not exist "%DEPENDENCIES%/" mkdir "%DEPENDENCIES%"
-
-    if exist "%GARRYSMOD_COMMON%/premake5.lua" (echo "garrysmod_common directory is good, pulling any latest changes" & git -C "%GARRYSMOD_COMMON%" pull & git -C "%GARRYSMOD_COMMON%" submodule update --init --recursive)
-
-    if not exist "%GARRYSMOD_COMMON%/premake5.lua" (echo "garrysmod_common directory is empty, doing git clone of the remote repo" & git clone --recursive "%GARRYSMOD_COMMON_REPOSITORY%" "%GARRYSMOD_COMMON%")
+- ps: 'Invoke-Expression ((New-Object System.Net.WebClient).DownloadString("$env:BOOTSTRAP_URL"))'
 cache:
 - $(APPVEYOR_BUILD_FOLDER)/dependencies/
-- $(APPVEYOR_BUILD_FOLDER)/projects/
 build_script:
-- cmd: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" && powershell -File "%BUILD_SCRIPT%"'
+- ps: '& "$env:BUILD_SCRIPT"'
 test: off
 artifacts:
 - path: projects/$(PROJECT_OS)/$(COMPILER_PLATFORM)/release/gmsv_$(MODULE_NAME)_$(TARGET_OS).dll

.travis.yml

@@ -9,11 +9,11 @@ env:
       DEPENDENCIES="$TRAVIS_BUILD_DIR/dependencies"
       GARRYSMOD_COMMON="$TRAVIS_BUILD_DIR/dependencies/garrysmod_common"
       SOURCE_SDK="$TRAVIS_BUILD_DIR/dependencies/sourcesdk-minimal"
+      BUILD_SCRIPT="$TRAVIS_BUILD_DIR/dependencies/garrysmod_common/build/build.sh"
+      GARRYSMOD_COMMON_REPOSITORY="https://github.com/danielga/garrysmod_common.git"
+      BOOTSTRAP_URL="https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh"
       TARGET_OS="$TRAVIS_OS_NAME"
       COMPILER_PLATFORM=gmake
-      BUILD_SCRIPT="$TRAVIS_BUILD_DIR/dependencies/garrysmod_common/build/ci.sh"
-      GARRYSMOD_COMMON_REPOSITORY="https://github.com/danielga/garrysmod_common.git"
-      PREMAKE5_EXECUTABLE=premake5
 matrix:
   include:
     - os: linux
@@ -29,6 +29,7 @@ matrix:
       env:
         - PREMAKE5="$TRAVIS_BUILD_DIR/dependencies/linux/premake-core/premake5"
           PROJECT_OS=linux
+          PREMAKE5_URL="https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz"
       before_install:
         - export CC=gcc-8
           export CXX=g++-8
@@ -37,20 +38,11 @@ matrix:
       env:
         - PREMAKE5="$TRAVIS_BUILD_DIR/dependencies/macosx/premake-core/premake5"
           PROJECT_OS=macosx
+          PREMAKE5_URL="https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-macosx.tar.gz"
 cache:
   directories:
     - "$TRAVIS_BUILD_DIR/dependencies"
-    - "$TRAVIS_BUILD_DIR/projects"
-install:
-  - mkdir -p "$DEPENDENCIES"
-  - if [ ! -f "$GARRYSMOD_COMMON/premake5.lua" ]; then
-      echo "garrysmod_common directory is empty, doing git clone of the remote repo";
-      git clone --recursive "$GARRYSMOD_COMMON_REPOSITORY" "$GARRYSMOD_COMMON";
-    else
-      echo "garrysmod_common directory is good, pulling any latest changes";
-      git -C "$GARRYSMOD_COMMON" pull;
-      git -C "$GARRYSMOD_COMMON" submodule update --init --recursive;
-    fi
+install: "curl -s -L \"$BOOTSTRAP_URL\" | bash"
 script: "$BUILD_SCRIPT"
 deploy:
   provider: releases

license.txt

@@ -2,7 +2,7 @@ gm_sourcenet
 A module for Garry's Mod that provides interfaces to many systems
 of VALVe's engine.
 -----------------------------------------------------------------------
-Copyright (c) 2015-2018, Daniel Almeida
+Copyright (c) 2015-2019, Daniel Almeida
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

projects/premake5.lua

@@ -4,12 +4,8 @@ newoption({
 	value = "path to garrysmod_common directory"
 })
 
-local gmcommon = _OPTIONS.gmcommon or os.getenv("GARRYSMOD_COMMON")
-if gmcommon == nil then
-	error("you didn't provide a path to your garrysmod_common (https://github.com/danielga/garrysmod_common) directory")
-end
-
-include(gmcommon)
+include(assert(_OPTIONS.gmcommon or os.getenv("GARRYSMOD_COMMON"),
+	"you didn't provide a path to your garrysmod_common (https://github.com/danielga/garrysmod_common) directory"))
 
 CreateWorkspace({name = "sourcenet", abi_compatible = true})
 	CreateProject({serverside = true})
@@ -42,7 +38,3 @@ CreateWorkspace({name = "sourcenet", abi_compatible = true})
 			["Header files"] = "../source/lzma/*.h",
 			["Source files"] = "../source/lzma/*.c"
 		})
-
-		filter("system:macosx")
-			buildoptions("-mmacosx-version-min=10.5")
-			linkoptions("-mmacosx-version-min=10.5")

readme.md

@@ -1,6 +1,6 @@
 # gm\_sourcenet
 
-A module for Garry's Mod that provides interfaces to many systems of VALVe's engine, based on [gm\_sourcenet3][1].  
+A module for Garry's Mod that provides interfaces to many systems of VALVe's engine, based on [gm\_sourcenet3][1], created by Chrisaster.  
 
 ## Compiling
 
@@ -15,6 +15,6 @@ If stuff starts erroring or fails to work, be sure to check the correct line end
 This project requires [garrysmod\_common][2], a framework to facilitate the creation of compilations files (Visual Studio, make, XCode, etc). Simply set the environment variable '**GARRYSMOD\_COMMON**' or the premake option '**gmcommon**' to the path of your local copy of [garrysmod\_common][2].  
 We also use [SourceSDK2013][3], so set the environment variable '**SOURCE\_SDK**' or the premake option '**sourcesdk**' to the path of your local copy of [SourceSDK2013][3]. The previous links to [SourceSDK2013][3] point to my own fork of VALVe's repo and for good reason: Garry's Mod has lots of backwards incompatible changes to interfaces and it's much smaller, being perfect for automated build systems like Travis-CI.  
 
-  [1]: http://christopherthorne.googlecode.com/svn/trunk/gm_sourcenet3
+  [1]: https://github.com/AlexSwift/GMod13-Modules/tree/master/gm_sourcenet3
   [2]: https://github.com/danielga/garrysmod_common
   [3]: https://github.com/danielga/sourcesdk-minimal