Skip to content

Commit

Permalink
Merge branch 'Vortex2Oblivion:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
JonnycatMeow authored Dec 10, 2023
2 parents 7645b22 + a846f9d commit 806d735
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ jobs:
haxelib --quiet git hxpy https://github.com/Vortex2Oblivion/hxpy
cd "test/demos/running code from a file"
haxe build.hxml
4 changes: 2 additions & 2 deletions haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"license": "MIT",
"tags": ["hxcpp", "cpp", "bindings", "native", "python"],
"description": "Haxe/hxcpp @:native bindings for Python",
"version": "0.0.1",
"releasenote": "Work In Progress",
"version": "1.0.0",
"releasenote": "Cleaned some stuff up, Added mac/linux support hopefully",
"contributors": ["Vortex"],
"dependencies": {
"hxcpp": ""
Expand Down
19 changes: 7 additions & 12 deletions test/demos/extending python/src/Main.hx
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
package;

import hxpy.PythonExtend;
import hxpy.PythonOpen;
import hxpy.PythonFile;
import hxpy.Python;
import addon.SpamModule;


import hxpy.Python.File;

class Main {
public static function main():Void {
//tracing some basic copyright and version information
trace("Python Ver: " + Python.VERSION);
SpamModule.spam_system(null,null);
PythonOpen.pythonInitialize(); // Initializes python
PythonFile.pythonRunSimpleFile("script.py"); // runs code
PythonOpen.pythonFinalize(); // closes python
//initializes the python instance
Python.initialize();
//runs code path to script file
File.runSimpleFile("script.py");
//closes the python instance
Python.finalize();
}
}
7 changes: 0 additions & 7 deletions test/demos/extending python/src/addon/Build.xml

This file was deleted.

14 changes: 0 additions & 14 deletions test/demos/extending python/src/addon/SpamModule.hx

This file was deleted.

14 changes: 0 additions & 14 deletions test/demos/extending python/src/addon/include/spammodule.c

This file was deleted.

2 changes: 1 addition & 1 deletion test/demos/running code from a file/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pythonRunSimpleFile
# running code from a file

This demo is to showcase the ability to run a python script from a file. No extending yet!
## Status
Expand Down
2 changes: 1 addition & 1 deletion test/demos/running code without a file/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pythonRunSimpleString
# running code without a file

This demo is to showcase the pythonRunSimpleString function, this function should allow for the use of running python code directly within the application. Don't know why anyone would use that over actually adding it in normally *cough cough psych engine cough cough* but its there ig.
## Status
Expand Down

0 comments on commit 806d735

Please sign in to comment.