Skip to content

Commit

Permalink
Release 1.8.19 (#87)
Browse files Browse the repository at this point in the history
* attempt at deploy script to work from 3p-packages-source

Signed-off-by: Vivien Oddou <vivien.oddou@siliconstudio.co.jp>

* Attempt at fixing package making scripts. In face of "testapp.py", line 121 NameEffor because of `fg.`

Signed-off-by: Vivien Oddou <vivien.oddou@siliconstudio.co.jp>

* Trying to understand why the 3p package still fails using explicit import names.

Signed-off-by: Vivien Oddou <vivien.oddou@siliconstudio.co.jp>

* Radical attempt

Signed-off-by: Vivien Oddou <vivien.oddou@siliconstudio.co.jp>

* try to cater to 3p environment

Signed-off-by: Vivien Oddou <vivien.oddou@siliconstudio.co.jp>

---------

Signed-off-by: Vivien Oddou <vivien.oddou@siliconstudio.co.jp>
  • Loading branch information
siliconvoodoo authored Dec 18, 2023
1 parent d378fd4 commit 219aa96
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion prepare_solution_win.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ REM

set platform=win
set architecture=x64
set generator="Visual Studio 16 2019"
set generator="Visual Studio 17 2022"

set curr_dir=%~dp0
set src_path=%curr_dir%\src
Expand Down
2 changes: 1 addition & 1 deletion test.and.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import re
import importlib
sys.path.append("tests")
from clr import *
from tests.clr import *

testList = ['Syntax', 'Semantic', 'Advanced', 'Samples']

Expand Down
10 changes: 9 additions & 1 deletion tests/testapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@
import io
from argparse import ArgumentParser
from os.path import join, normpath, basename
from clr import *
import inspect
clrpath = os.path.join(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))), "clr.py")
print(f"clr path is {clrpath}")
import importlib.util
spec = importlib.util.spec_from_file_location("clr", clrpath)
clrmodule = importlib.util.module_from_spec(spec)
sys.modules["clr"] = clrmodule
spec.loader.exec_module(clrmodule)
globals().update({v: vars(clrmodule)[v] for v in ["fg", "bg", "style"]})
import re
import testfuncs
import importlib
Expand Down

0 comments on commit 219aa96

Please sign in to comment.