Edited changelog

.gitea/workflows/build_composer.yaml

@@ -0,0 +1,29 @@
+
+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 }}      

.gitignore

@@ -0,0 +1 @@
+tags

CHANGELOG.md

@@ -0,0 +1,24 @@
+# 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
+
+## [1.0.4] - 2022-06-01
+### Fixed
+- Fixed build project path
+
+## [1.0.3] - 2022-05-31
+### Added
+- A changelog. Cuz why not? :D
+
+### Fixed
+- Task unity now uses proper folder from propery

composer.json

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

unity.inc.php

@@ -5,39 +5,35 @@ use Exception;
 task('unity', function()
 {
   $unity_path = guess_unity_app_dir();
+  $proj_path = normalize_path(get("UNITY_ASSETS_DIR") . '/../');
   if(is_win())
   {
     $unity_app_path = "'$unity_path/Editor/Unity.exe'";
-    run_background_proc($unity_app_path, ['-projectPath', '.']);
+    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 . > /dev/null 2>&1&";
+    $cmd = guess_unity_app_dir()."'Unity.app/Contents/MacOS/Unity' -projectPath '$proj_path' > /dev/null 2>&1&";
     system($cmd, $res);
   }
 });
 
 task('unity_kill', function()
 {     
-  $proc_id = unity_find_proc_id();
+  unity_kill();
-  if($proc_id)
-  {
-    echo "Found Unity process '$proc_id', killing it...\n";
-    system("kill -9 $proc_id");
-    sleep(5);
-  }
-  else
-  {
-    echo "No Unity process found to kill\n";
-  }
 });
 
-
 function unity_exec($func, $build_target = "", $quit = true, $batchmode = true)
 {
   global $GAME_ROOT;
 
-  $proj_path = normalize_path("$GAME_ROOT/");
+  $proj_path = normalize_path(get("UNITY_ASSETS_DIR") . '/../');
 
   $log_file = "$GAME_ROOT/build/unity.log";
   ensure_rm($log_file);
@@ -67,33 +63,57 @@ function unity_exec($func, $build_target = "", $quit = true, $batchmode = true)
   return array($log_file, $pid);
 }
 
-function unity_batch_exec($func, $build_target = "", $notify = true)
+function unity_batch_exec($func, $build_target = "")
 {
   global $GAME_ROOT;
 
-  try
+  unity_kill();
-  {
-    list($log_file, $pid) = unity_exec($func, $build_target, /*$quit = */ true, /*$batchmode = */ true);
 
-    watch_running_process($pid, $log_file, 
+  list($log_file, $pid) = unity_exec($func, $build_target, /*$quit = */ true, /*$batchmode = */ true);
-      array(
+
-      'Exiting batchmode successfully'
+  watch_running_process(
-      ),
+    $pid, 
-      array(
+    $log_file, 
-      'UnityException:',
+    array(
-      'Aborting batchmode due to failure', 
+    'Exiting batchmode successfully',
-      'Launching bug reporter',
+    'Batchmode quit successfully invoked - shutting down!'
+    ),
+    array(
+    'Build Finished, Result: Failure',
+    'UnityException:',
+    'Aborting batchmode due to failure', 
+    'Launching bug reporter',
+    'Unrecognized assets cannot be included in AssetBundles:'
+    ),
+    true,
+    -1,
+    //ignored errors:
+    array(
+      //NOTE: weird editor crash, sometimes happens on exit after batch task is actually done
+      //      seems like it's never been fixed though issue tracker says otherwise (https://vk.cc/bYpyUS)
+      "Fatal Error! GetManagerFromContext: pointer to object of manager 'MonoManager' is NULL (table index 5)"
+    ),
+
+    //noted warnings: they don't abort execution but show up at the end of the log if command fails
+    array(
       ': error CS',
-      'Unrecognized assets cannot be included in AssetBundles:'
+    )
-      )
+  );
-    );
-  }
-  catch(Exception $e)
-  {
-    throw $e;
-  }
 }
 
+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');
@@ -104,6 +124,10 @@ 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 $!";
@@ -115,6 +139,19 @@ function unity_run_proc($shared_cmd)
   return trim($out[0]);
 }
 
+function unity_kill()
+{
+  $proc_id = unity_find_proc_id();
+  if($proc_id)
+  {
+    echo "Found Unity process '$proc_id', killing it...\n";
+    system("kill -9 $proc_id");
+    sleep(5);
+  }
+  else
+    echo "No Unity process found to kill\n";
+}
+
 function unity_find_proc_id()
 {
   global $GAME_ROOT;
@@ -138,13 +175,14 @@ 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))
   {
     list($_, $unity_version) = array_map('trim', explode(":", file($proj_version_file)[0]));
-    if(is_dir("{$path}Hub/Editor/$unity_version/"))
+    $path .= "Hub/Editor/$unity_version/"; 
-      $path .= "Hub/Editor/$unity_version/"; 
   }
   return $path;
 }
@@ -153,9 +191,190 @@ function get_unity_dir()
 {
   $app_dir = get('UNITY_APP_DIR');
 
-  if(is_win())
+  if(is_win() || is_linux())
     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"))
+    return 'mcs';
+
+  $unity_dir = get_unity_dir();
+
+  if(!is_dir($unity_dir))
+    throw new Exception("Unity directory doesn't exist: $unity_dir");
+
+  $canidates = array(
+    "$unity_dir/Mono/bin/gmcs",
+    "$unity_dir/MonoBleedingEdge/bin/mcs",
+    "$unity_dir/Frameworks/Mono/bin/gmcs",
+    "$unity_dir/Mono/bin/gmcs",
+  );
+
+  foreach($canidates as $mcs_bin)
+  {
+    if(is_file($mcs_bin))
+    {
+      if(is_win())
+        return '"' . normalize_path($mcs_bin, false) . '"';
+      else
+        return $mcs_bin;
+    }
+  }
+  
+  throw new Exception("Mono compiler binary not found");
+}
+
+function mono_try_override_path()
+{
+  if(!get("USE_UNITY_MONO"))
+    return '';
+  
+  $mono_dir = dirname(trim(mono_mcs_bin(), '"'));
+  $prev_path = getenv('PATH');
+  echo "UNITY MONO PATH=$mono_dir\n";
+  putenv("PATH=$mono_dir".(is_win() ? ";" : ":")."$prev_path");
+  return $prev_path;
+}
+
+function mono_try_restore_path($prev_path)
+{
+  if(!get("USE_UNITY_MONO"))
+    return;
+  
+  putenv("PATH=$prev_path");
+}
+
+function build_mono_dll($src_spec, $out_file, $ref_dlls = array(), $mcs_opts = "")
+{
+  build_mono($src_spec, $out_file, $ref_dlls, "$mcs_opts -target:library");
+}
+
+function build_mono($src_spec, $out_file, $ref_dlls = array(), $mcs_opts = "")
+{
+  global $GAME_ROOT;
+
+  $unity_dir = get_unity_dir();
+  $mcs_bin = mono_mcs_bin();
+
+  if(is_array($src_spec))
+    $sources = $src_spec;
+  else if(is_dir($src_spec))
+    $sources = scan_files_rec(array($src_spec), array('.cs'));
+  else
+    $sources = glob($src_spec);
+
+  $sources_str = '';
+  foreach($sources as $src)
+  {
+    if(is_win())
+      $sources_str .= '"'.normalize_path($src).'" ';
+    else
+      $sources_str .= '\''.normalize_path($src).'\' ';
+  }
+    
+  $deps = $sources;
+
+  $refs_str = "";
+  foreach($ref_dlls as $ref_dll)
+  {
+    if($ref_dll === "UnityEngine.dll")
+    {
+      $ref_dll = "$unity_dir/Managed/UnityEngine.dll"; 
+      if(!is_file($ref_dll))
+        $ref_dll = "$unity_dir/Frameworks/Managed/UnityEngine.dll";
+    }
+
+    $ref_dll = normalize_path($ref_dll, !is_win());
+    $refs_str .= "-r:\"$ref_dll\" ";
+    $deps[] = $ref_dll;
+  }
+
+  $out_file = normalize_path($out_file, !is_win());
+  $cmd = "$mcs_bin $mcs_opts $refs_str -out:$out_file $sources_str";
+  if(is_string($src_spec) && is_dir($src_spec))
+    $cmd = "cd $src_spec && $cmd";
+
+  $cmd_hash = crc32($cmd);
+  $cmd_hash_file = "$GAME_ROOT/build/" . crc32($out_file) . ".mhash";
+  if(!is_file($cmd_hash_file) || file_get_contents($cmd_hash_file) != "$cmd_hash")
+    file_put_contents($cmd_hash_file, "$cmd_hash");
+  $deps[] = $cmd_hash_file;
+
+  if(need_to_regen($out_file, $deps))
+  {
+    ensure_mkdir(dirname($out_file));
+    shell($cmd);
+    echo "> $out_file " . round(filesize($out_file)/1024, 2) . "kb\n";
+  }
+}
+
+function run_mono($exe_file)
+{
+  $app_dir = get('UNITY_APP_DIR');
+
+  if(is_win())
+  {
+    $unity_dir = "$app_dir/Editor/Data";
+    $mono_bin = '"' . normalize_path("$unity_dir/Mono/bin/mono") . '"';
+  }  
+  else
+  {
+    $unity_dir = "$app_dir/Unity.app/Contents/"; 
+    
+    if(is_dir("$unity_dir/Frameworks/Mono"))
+      $mono_bin = "$unity_dir/Frameworks/Mono/bin/mono";
+    else
+      $mono_bin = "$unity_dir/Mono/bin/mono";
+  }
+
+  $exe_file = normalize_path($exe_file, !is_win());
+  $mono_path = realpath(dirname($mono_bin) . '/../lib/mono/unity'); 
+  putenv("MONO_PATH=$mono_path");
+  $cmd = "$mono_bin $exe_file";
+  shell($cmd);
+}
+
+function build_option_exists($option)
+{
+  return strpos(getor("BUILD_CLIENT_OPTS", ""), $option) !== FALSE;
+}
+
+function build_option_add($option)
+{
+  if(build_option_exists($option))
+    return;
+
+  $propname = "BUILD_CLIENT_OPTS";
+
+  $opts = getor($propname, "");
+  if(strlen($opts) > 0)
+    $opts .= ",$option";
+  else
+    $opts = $option;
+
+  set($propname, $opts);
+}
+
+function is_gradle_project_export() 
+{
+  return build_option_exists("AcceptExternalModificationsToPlayer");
+}
+