Commit 7f018b01 authored by nanahira's avatar nanahira

use 1 submodule init

parent 3111cb98
...@@ -8,8 +8,6 @@ export EVENT_LIB_DIR=$PWD/libevent-stable/lib ...@@ -8,8 +8,6 @@ export EVENT_LIB_DIR=$PWD/libevent-stable/lib
export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include
export IRRLICHT_LIB_DIR=$PWD/irrlicht export IRRLICHT_LIB_DIR=$PWD/irrlicht
git submodule update --init
./premake5 gmake --cc=clang --build-freetype --build-sqlite ./premake5 gmake --cc=clang --build-freetype --build-sqlite
cd build cd build
......
...@@ -9,7 +9,6 @@ ARCHIVE_FILES=(ygopro LICENSE README.md lib lflist.conf strings.conf system.conf ...@@ -9,7 +9,6 @@ ARCHIVE_FILES=(ygopro LICENSE README.md lib lflist.conf strings.conf system.conf
TARGET_PLATFORM=linux TARGET_PLATFORM=linux
apt update && apt -y install tar git zstd apt update && apt -y install tar git zstd
git submodule update --init
mkdir dist replay mkdir dist replay
tar -acf "dist/KoishiPro-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}" tar -acf "dist/KoishiPro-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}"
...@@ -9,7 +9,6 @@ ARCHIVE_FILES=(ygopro.app LICENSE README.md lflist.conf strings.conf system.conf ...@@ -9,7 +9,6 @@ ARCHIVE_FILES=(ygopro.app LICENSE README.md lflist.conf strings.conf system.conf
TARGET_PLATFORM=darwin TARGET_PLATFORM=darwin
apt update && apt -y install tar git zstd apt update && apt -y install tar git zstd
git submodule update --init
mkdir dist replay mkdir dist replay
tar -acf "dist/KoishiPro-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}" tar -acf "dist/KoishiPro-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}"
...@@ -12,7 +12,6 @@ fi ...@@ -12,7 +12,6 @@ fi
TARGET_PLATFORM=win32 TARGET_PLATFORM=win32
apt update && apt -y install p7zip-full git apt update && apt -y install p7zip-full git
git submodule update --init
mkdir dist replay mkdir dist replay
7z a -mx9 -xr!.git* dist/KoishiPro-$CI_COMMIT_REF_NAME-win32-$TARGET_LOCALE.7z "${ARCHIVE_FILES[@]}" 7z a -mx9 -xr!.git* dist/KoishiPro-$CI_COMMIT_REF_NAME-win32-$TARGET_LOCALE.7z "${ARCHIVE_FILES[@]}"
...@@ -13,7 +13,6 @@ fi ...@@ -13,7 +13,6 @@ fi
TARGET_PLATFORM=win32 TARGET_PLATFORM=win32
apt update && apt -y install tar git zstd apt update && apt -y install tar git zstd
git submodule update --init
mkdir dist replay mkdir dist replay
tar -acf "dist/KoishiPro-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}" tar -acf "dist/KoishiPro-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}"
...@@ -30,6 +30,16 @@ mat_common: ...@@ -30,6 +30,16 @@ mat_common:
- freetype - freetype
- sqlite3 - sqlite3
mat_submodules:
stage: prepare
tags:
- linux
script: git submodule update --init
artifacts:
paths:
- ocgcore
- script
mat_irrklang: mat_irrklang:
stage: prepare stage: prepare
tags: tags:
...@@ -147,8 +157,8 @@ exec_windows: ...@@ -147,8 +157,8 @@ exec_windows:
- mat_common - mat_common
- mat_irrklang - mat_irrklang
- mat_windows - mat_windows
- mat_submodules
script: script:
- git submodule update --init
- bash -c 'cp -rf premake/* .' - bash -c 'cp -rf premake/* .'
- '.\premake5.exe vs2019 --irrklang-pro' - '.\premake5.exe vs2019 --irrklang-pro'
- cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release' - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release'
...@@ -165,9 +175,9 @@ exec_linux: ...@@ -165,9 +175,9 @@ exec_linux:
- mat_common - mat_common
- mat_irrklang - mat_irrklang
- mat_linux - mat_linux
- mat_submodules
script: script:
- apt update; apt -y install git build-essential libgl1-mesa-dev libglu-dev libxxf86vm-dev - apt update; apt -y install git build-essential libgl1-mesa-dev libglu-dev libxxf86vm-dev
- git submodule update --init
- mkdir lib - mkdir lib
- cp -rf irrklang/bin/linux-gcc-64/libIrrKlang.so ./lib/ - cp -rf irrklang/bin/linux-gcc-64/libIrrKlang.so ./lib/
# - cp -rf irrklang/bin/linux-gcc-64/ikpMP3.so ./lib/ # - cp -rf irrklang/bin/linux-gcc-64/ikpMP3.so ./lib/
...@@ -201,6 +211,7 @@ exec_macos_platform_x86: ...@@ -201,6 +211,7 @@ exec_macos_platform_x86:
- mat_macos - mat_macos
- mat_common - mat_common
- mat_macos_platform_x86 - mat_macos_platform_x86
- mat_submodules
variables: variables:
TARGET_PLATFORM: x86 TARGET_PLATFORM: x86
BUILD_IKPMP3: '1' BUILD_IKPMP3: '1'
...@@ -211,6 +222,7 @@ exec_macos_platform_m1: ...@@ -211,6 +222,7 @@ exec_macos_platform_m1:
- mat_macos - mat_macos
- mat_common - mat_common
- mat_macos_platform_m1 - mat_macos_platform_m1
- mat_submodules
variables: variables:
TARGET_PLATFORM: m1 TARGET_PLATFORM: m1
MAC_ARM: '1' MAC_ARM: '1'
...@@ -416,6 +428,7 @@ assets_en-US: ...@@ -416,6 +428,7 @@ assets_en-US:
- assets_windows - assets_windows
- exec_windows - exec_windows
- assets_zh-CN - assets_zh-CN
- mat_submodules
._pack_assets_linux_zh-CN: ._pack_assets_linux_zh-CN:
extends: ._pack extends: ._pack
...@@ -424,6 +437,7 @@ assets_en-US: ...@@ -424,6 +437,7 @@ assets_en-US:
- assets_nonwindows - assets_nonwindows
- exec_linux - exec_linux
- assets_zh-CN - assets_zh-CN
- mat_submodules
._pack_assets_macos_zh-CN: ._pack_assets_macos_zh-CN:
extends: ._pack extends: ._pack
...@@ -432,6 +446,7 @@ assets_en-US: ...@@ -432,6 +446,7 @@ assets_en-US:
- assets_nonwindows - assets_nonwindows
- exec_macos - exec_macos
- assets_zh-CN - assets_zh-CN
- mat_submodules
._pack_assets_windows_en-US: ._pack_assets_windows_en-US:
extends: ._pack extends: ._pack
...@@ -440,6 +455,7 @@ assets_en-US: ...@@ -440,6 +455,7 @@ assets_en-US:
- assets_windows - assets_windows
- exec_windows - exec_windows
- assets_en-US - assets_en-US
- mat_submodules
._pack_assets_linux_en-US: ._pack_assets_linux_en-US:
extends: ._pack extends: ._pack
...@@ -448,6 +464,7 @@ assets_en-US: ...@@ -448,6 +464,7 @@ assets_en-US:
- assets_nonwindows - assets_nonwindows
- exec_linux - exec_linux
- assets_en-US - assets_en-US
- mat_submodules
._pack_assets_macos_en-US: ._pack_assets_macos_en-US:
extends: ._pack extends: ._pack
...@@ -456,24 +473,28 @@ assets_en-US: ...@@ -456,24 +473,28 @@ assets_en-US:
- assets_nonwindows - assets_nonwindows
- exec_macos - exec_macos
- assets_en-US - assets_en-US
- mat_submodules
._pack_assets_windows_dlc: ._pack_assets_windows_dlc:
extends: ._pack extends: ._pack
dependencies: dependencies:
- assets - assets
- exec_windows - exec_windows
- mat_submodules
._pack_assets_linux_dlc: ._pack_assets_linux_dlc:
extends: ._pack extends: ._pack
dependencies: dependencies:
- assets - assets
- exec_linux - exec_linux
- mat_submodules
._pack_assets_macos_dlc: ._pack_assets_macos_dlc:
extends: ._pack extends: ._pack
dependencies: dependencies:
- assets - assets
- exec_macos - exec_macos
- mat_submodules
pack_windows_dlc_zh-CN: pack_windows_dlc_zh-CN:
extends: extends:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment