Browse Source

Upgrade premake in preparation for .NET Core (#1298)

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/1434/head
Dimitar Dobrev 5 years ago committed by GitHub
parent
commit
bc410cf619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .travis.yml
  2. 2
      build/Compile.sh
  3. 2
      build/InstallMono.sh
  4. BIN
      build/premake5-linux
  5. BIN
      build/premake5-linux-64
  6. BIN
      build/premake5-osx
  7. BIN
      build/premake5.exe
  8. 2
      docs/BuildingLLVM.md
  9. 4
      docs/GettingStarted.md

2
.travis.yml

@ -21,7 +21,7 @@ install: @@ -21,7 +21,7 @@ install:
- source build/InstallMono.sh
- build/InstallNugets.sh
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then export CXX="g++-7" CC="gcc-7"; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then PREMAKE=build/premake5-linux-64; else PREMAKE=build/premake5-osx; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then PREMAKE=build/premake5-linux; else PREMAKE=build/premake5-osx; fi
- $PREMAKE --file=build/scripts/LLVM.lua download_llvm
script: |

2
build/Compile.sh

@ -19,7 +19,7 @@ done @@ -19,7 +19,7 @@ done
if [ "$(uname)" == "Darwin" ]; then
PREMAKE=$CUR_DIR/premake5-osx;
elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
PREMAKE=$CUR_DIR/premake5-linux-64;
PREMAKE=$CUR_DIR/premake5-linux;
fi
MONO=mono

2
build/InstallMono.sh

@ -8,5 +8,5 @@ elif [ "$OS" == "Linux" ]; then @@ -8,5 +8,5 @@ elif [ "$OS" == "Linux" ]; then
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
sudo apt-get update -qq
sudo apt-get install -y --force-yes mono-mcs libmono-system-runtime4.0-cil
sudo apt-get install -y --force-yes mono-mcs mono-roslyn libmono-system-runtime4.0-cil
fi

BIN
build/premake5-linux

Binary file not shown.

BIN
build/premake5-linux-64

Binary file not shown.

BIN
build/premake5-osx

Binary file not shown.

BIN
build/premake5.exe

Binary file not shown.

2
docs/BuildingLLVM.md

@ -26,7 +26,7 @@ $PREMAKE --file=scripts/LLVM.lua build_llvm @@ -26,7 +26,7 @@ $PREMAKE --file=scripts/LLVM.lua build_llvm
$PREMAKE --file=scripts/LLVM.lua package_llvm
```
`$PREMAKE` should be replaced with `premake5.exe`, `premake5-osx` or `premake5-linux-64` depending on environment.
`$PREMAKE` should be replaced with `premake5.exe`, `premake5-osx` or `premake5-linux` depending on environment.
You can specify an `--arch=x86` or `--arch=x64` flag to the invocations above to specify an explicit build architecture.

4
docs/GettingStarted.md

@ -33,7 +33,7 @@ The dependencies can be automatically downloaded by running: @@ -33,7 +33,7 @@ The dependencies can be automatically downloaded by running:
cd <CppSharp>\build
premake5 --file=scripts/LLVM.lua download_llvm # on Windows
premake5-osx --file=scripts/LLVM.lua download_llvm # on OSX
premake5-linux-64 --file=scripts/LLVM.lua download_llvm # on Linux
premake5-linux --file=scripts/LLVM.lua download_llvm # on Linux
```
Alternatively, if on Windows, just run `<CppSharp>/build/DownloadDeps.bat` from a Visual Studio command prompt
@ -80,7 +80,7 @@ If the above script fails, you can try these equivalent manual steps: @@ -80,7 +80,7 @@ If the above script fails, you can try these equivalent manual steps:
```
./premake5-osx gmake # if on OSX
./premake5-linux-64 gmake # if on Linux
./premake5-linux gmake # if on Linux
```
2. Build the generated makefiles:

Loading…
Cancel
Save