Compare commits

..

No commits in common. "master" and "v1.0.8" have entirely different histories.

5 changed files with 9 additions and 78 deletions

View File

@ -1,29 +0,0 @@
name: Publish PHP Package
on:
push:
tags:
- 'v*'
jobs:
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Get tag name
run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: zip and send
run: |
ls -la
apt-get update -y
apt-get install -y zip
cd ../
zip -r ${{ gitea.event.repository.name }}.zip ${{ gitea.event.repository.name }} -x '*.git*'
curl -v \
--user composer-pbl:${{ secrets.COMPOSER_PSWD }} \
--upload-file ${{ gitea.event.repository.name }}.zip \
https://git.bit5.ru/api/packages/bit/composer?version=${{ env.TAG }}

1
.gitignore vendored
View File

@ -1 +0,0 @@
tags

View File

@ -1,13 +1,10 @@
# Change Log
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## [1.0.21] - 2025-03-13
### Fixed
- Added helper methods, fixed Linux
## [1.0.5] - 2022-08-09
### Fixed
- Unity task on windows not working
@ -21,4 +18,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- A changelog. Cuz why not? :D
### Fixed
- Task unity now uses proper folder from propery
- Task unity now uses proper folder from propery

View File

@ -4,5 +4,8 @@
"homepage": "https://git.bit5.ru/composer/taskman_unity",
"require": {
"php": ">=7.4"
},
"autoload": {
"classmap": ["unity.inc.php"]
}
}

View File

@ -11,12 +11,6 @@ task('unity', function()
$unity_app_path = "'$unity_path/Editor/Unity.exe'";
run_background_proc($unity_app_path, ['-projectPath', "$proj_path"]);
}
else if(is_linux())
{
$unity_path = get('UNITY_APP_DIR');
$unity_app_path = "'$unity_path/Editor/Unity'";
run_background_proc($unity_app_path, ['-projectPath', "$proj_path"]);
}
else
{
$cmd = guess_unity_app_dir()."'Unity.app/Contents/MacOS/Unity' -projectPath '$proj_path' > /dev/null 2>&1&";
@ -101,19 +95,6 @@ function unity_batch_exec($func, $build_target = "")
);
}
task('unity_batch_exec', function(array $args)
{
if(count($args) != 2)
{
echo "Usage: gamectl unity_batch_exec <method name> <platform>\n";
return;
}
$func = $args[0];
$platform = $args[1];
unity_batch_exec($func, $platform);
});
function unity_run_proc($shared_cmd)
{
$app_dir = get('UNITY_APP_DIR');
@ -124,10 +105,6 @@ function unity_run_proc($shared_cmd)
$unity_app_path = $app_dir . "Editor/Unity.exe";
$cmd = "powershell.exe (Start-Process '$unity_app_path'-ArgumentList '$shared_cmd' -passthru).Id";
}
else if(is_linux())
{
$cmd = "'$app_dir/Editor/Unity' $shared_cmd > /dev/null & echo $!";
}
else
{
$cmd = "'$app_dir/Unity.app/Contents/MacOS/Unity' $shared_cmd > /dev/null & echo $!";
@ -175,8 +152,6 @@ function guess_unity_app_dir()
$path = "/Applications/Unity/";
if(is_win())
$path = getenv("ProgramFiles")."/Unity/";
else if(is_linux())
$path = getenv("HOME")."/Unity/";
$proj_version_file = $GAME_ROOT.'/unity/ProjectSettings/ProjectVersion.txt';
if(is_file($proj_version_file))
@ -191,26 +166,12 @@ function get_unity_dir()
{
$app_dir = get('UNITY_APP_DIR');
if(is_win() || is_linux())
if(is_win())
return "$app_dir/Editor/Data";
else
return "$app_dir/Unity.app/Contents/";
}
function unity_build_cmd($shared_cmd)
{
$app_dir = get('UNITY_APP_DIR');
if(is_win())
$cmd = "\"$app_dir/Editor/Unity.exe\" $shared_cmd";
else if(is_linux())
$cmd = "\"$app_dir/Editor/Unity\" $shared_cmd";
else
$cmd = "$app_dir/Unity.app/Contents/MacOS/Unity $shared_cmd";
return $cmd;
}
function mono_mcs_bin()
{
if(!get("USE_UNITY_MONO"))
@ -285,9 +246,9 @@ function build_mono($src_spec, $out_file, $ref_dlls = array(), $mcs_opts = "")
foreach($sources as $src)
{
if(is_win())
$sources_str .= '"'.normalize_path($src).'" ';
$sources_str .= '"'.normalize_path($src, !is_win()).'" ';
else
$sources_str .= '\''.normalize_path($src).'\' ';
$sources_str .= '\''.normalize_path($src, !is_win()).'\' ';
}
$deps = $sources;
@ -333,7 +294,7 @@ function run_mono($exe_file)
if(is_win())
{
$unity_dir = "$app_dir/Editor/Data";
$mono_bin = '"' . normalize_path("$unity_dir/Mono/bin/mono") . '"';
$mono_bin = '"' . normalize_path("$unity_dir/Mono/bin/mono", !is_win()) . '"';
}
else
{