Some cleanup - moved glue generation scripts to 'scripts', leaving ge…

…nerated foreign interfaces in 'glue'
jarikomppa · Apr 19, 2015 · c36af7c · c36af7c
1 parent 8254a32
commit c36af7c
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 10 deletions.
diff --git a/glue/checkapidoc.py → scripts/checkapidoc.py b/glue/checkapidoc.py → scripts/checkapidoc.py
diff --git a/glue/compile_gamemaker_dll.bat → scripts/compile_gamemaker_dll.bat b/glue/compile_gamemaker_dll.bat → scripts/compile_gamemaker_dll.bat
diff --git a/glue/gen_autoit.py → scripts/gen_autoit.py b/glue/gen_autoit.py → scripts/gen_autoit.py
diff --git a/glue/gen_blitzmax.py → scripts/gen_blitzmax.py b/glue/gen_blitzmax.py → scripts/gen_blitzmax.py
@@ -3,7 +3,7 @@
 
 import soloud_codegen 
 
-fo = open("soloud.bmx", "w")
+fo = open("../glue/soloud.bmx", "w")
 
 """
 Global SoloudLib:Int = LoadLibraryA ("soloud_x86.dll")

diff --git a/glue/gen_cs.py → scripts/gen_cs.py b/glue/gen_cs.py → scripts/gen_cs.py
@@ -2,7 +2,7 @@
 
 import soloud_codegen
 
-fo = open("soloud.cs", "w")
+fo = open("../glue/soloud.cs", "w")
 
 
 C_TO_CS_TYPES = {

diff --git a/glue/gen_d.py → scripts/gen_d.py b/glue/gen_d.py → scripts/gen_d.py
@@ -2,7 +2,7 @@
 
 import soloud_codegen
 
-fo = open("soloud.d", "w")
+fo = open("../glue/soloud.d", "w")
 
 
 C_TO_D_TYPES = {

diff --git a/glue/gen_gamemaker.py → scripts/gen_gamemaker.py b/glue/gen_gamemaker.py → scripts/gen_gamemaker.py
@@ -368,5 +368,3 @@
 
 callp = ["make_gmez.bat"]
 subprocess.call(callp)
-
-print "Unless something went wrong, soloud.gmez should now be here."
diff --git a/glue/gen_python.py → scripts/gen_python.py b/glue/gen_python.py → scripts/gen_python.py
@@ -2,7 +2,7 @@
 
 import soloud_codegen
 
-fo = open("soloud.py", "w")
+fo = open("../glue/soloud.py", "w")
 
 #
 #    from ctypes import *

diff --git a/glue/gen_rpgmaker.py → scripts/gen_rpgmaker.py b/glue/gen_rpgmaker.py → scripts/gen_rpgmaker.py
@@ -2,7 +2,7 @@
 
 import soloud_codegen
 
-fo = open("rpgmaker_soloud.rb", "w")
+fo = open("../glue/rpgmaker_soloud.rb", "w")
 
 #   module SoLoudImporter
 #       extend DL::Importer

diff --git a/glue/gen_ruby.py → scripts/gen_ruby.py b/glue/gen_ruby.py → scripts/gen_ruby.py
@@ -2,7 +2,7 @@
 
 import soloud_codegen
 
-fo = open("soloud.rb", "w")
+fo = open("../glue/soloud.rb", "w")
 
 #   module SoLoudImporter
 #       extend DL::Importer

diff --git a/glue/make_gmez.bat → scripts/make_gmez.bat b/glue/make_gmez.bat → scripts/make_gmez.bat
@@ -1,7 +1,7 @@
 @echo off
 del soloud.gmez
 cd gm_temp
-7z a -r -y ../soloud.gmez * 
+7z a -r -y ../../glue/soloud.gmez * 
 cd ..
 rd /s /q gm_temp
 del soloud_gamemaker_dll.*

diff --git a/scripts/makeglue.py b/scripts/makeglue.py
@@ -0,0 +1,6 @@
+import glob
+import subprocess
+
+for file in glob.glob("gen_*.py"):
+    subprocess.call(["python",file])
+
diff --git a/glue/soloud_codegen.py → scripts/soloud_codegen.py b/glue/soloud_codegen.py → scripts/soloud_codegen.py
diff --git a/glue/test_python.py → scripts/test_python.py b/glue/test_python.py → scripts/test_python.py
diff --git a/glue/test_ruby.rb → scripts/test_ruby.rb b/glue/test_ruby.rb → scripts/test_ruby.rb
diff --git a/src/tools/codegen/main.cpp b/src/tools/codegen/main.cpp
@@ -31,7 +31,7 @@ freely, subject to the following restrictions:
 #define VERSION "SoLoud C-Api Code Generator (c)2013-2015 Jari Komppa http://iki.fi/sol/"
 
 #define OUTDIR "../src/c_api/"
-#define PYOUTDIR "../glue/"
+#define PYOUTDIR "../scripts/"
 
 using namespace std;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -368,5 +368,3 @@

		callp = ["make_gmez.bat"]
		subprocess.call(callp)

		print "Unless something went wrong, soloud.gmez should now be here."