Skip to content

Commit

Permalink
Update license, premake5 config and Azure Pipelines config
Browse files Browse the repository at this point in the history
  • Loading branch information
danielga committed Jun 5, 2022
1 parent 54a85b3 commit 6718df8
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 6 deletions.
46 changes: 44 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
COMPILER_PLATFORM: vs2019
PROJECT_OS: windows
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/windows/premake-core/premake5.exe
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake5/premake-5.0.0-alpha16-windows.zip
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-windows.zip
steps:
- checkout: self
clean: true
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
COMPILER_PLATFORM: gmake
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/linux/premake-core/premake5
PROJECT_OS: linux
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake5/premake-5.0.0-alpha16-linux.tar.gz
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-linux.tar.gz
CC: gcc-9
CXX: g++-9
AR: gcc-ar-9
Expand Down Expand Up @@ -98,6 +98,47 @@ jobs:
displayName: 'Publish build artifacts'
inputs:
ArtifactName: linux
- job: macosx
displayName: macOS
pool:
name: Azure Pipelines
vmImage: macOS-11
timeoutInMinutes: 10
variables:
BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh
BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.sh
COMPILER_PLATFORM: gmake
PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/macosx/premake-core/premake5
PROJECT_OS: macosx
PREMAKE5_URL: https://github.com/danielga/garrysmod_common/releases/download/premake-build%2F5.0.0-beta1/premake-5.0.0-beta1-macosx.tar.gz
MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.7.sdk.tar.xz
MACOSX_SDK_DIRECTORY: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
SDKROOT: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
AR: ar
steps:
- checkout: self
clean: true
fetchDepth: 1
submodules: recursive
- bash: 'curl -s -L "$BOOTSTRAP_URL" | bash'
displayName: Bootstrap
- bash: |
sudo xcode-select -s "/Applications/Xcode_11.7.app/Contents/Developer"
$BUILD_SCRIPT
displayName: Build
- task: CopyFiles@2
displayName: 'Copy files to $(Build.ArtifactStagingDirectory)'
inputs:
SourceFolder: '$(System.DefaultWorkingDirectory)/projects/macosx/gmake'
Contents: '*/Release/*.dll'
TargetFolder: '$(Build.ArtifactStagingDirectory)'
CleanTargetFolder: true
flattenFolders: true
preserveTimestamp: true
- task: PublishBuildArtifacts@1
displayName: 'Publish build artifacts'
inputs:
ArtifactName: macosx
- job: publish
displayName: Publish to GitHub Releases
pool:
Expand All @@ -107,6 +148,7 @@ jobs:
dependsOn:
- windows
- linux
- macosx
condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
steps:
- task: DownloadBuildArtifacts@0
Expand Down
2 changes: 1 addition & 1 deletion license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ LuaPack - https://danielga.github.io/luapack
A Garry's Mod addon that attempts to speed up Lua files downloading
by compressing and packing them.
-----------------------------------------------------------------------
Copyright (c) 2014-2020, Daniel Almeida
Copyright (c) 2014-2022, Daniel Almeida
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
5 changes: 2 additions & 3 deletions premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ newoption({
value = "path to garrysmod_common directory"
})

local gmcommon = 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")
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 = "luapack_internal", abi_compatible = true})
CreateProject({serverside = true})
Expand Down

0 comments on commit 6718df8

Please sign in to comment.