remove all traces of hscript

haxeui · Aug 5, 2021 · 6b77905 · 6b77905
1 parent 47fbc74
commit 6b77905
Show file tree

Hide file tree

Showing 34 changed files with 5 additions and 351 deletions.
diff --git a/.github/commands/dox.hxml b/.github/commands/dox.hxml
@@ -1,7 +1,4 @@
--lib hscript
-#-lib actuate
 -lib haxeui-blank
-#-lib yaml
 
 #-main haxe.ui.Dox
 -cp .

diff --git a/cli/src/installs/kha/KhaInstall.hx b/cli/src/installs/kha/KhaInstall.hx
@@ -6,8 +6,7 @@ class KhaInstall extends HaxeLibInstall {
     public function new() {
         super([
             "haxeui-core",
-            "haxeui-kha",
-            "hscript"
+            "haxeui-kha"
         ]);
     }
 

diff --git a/cli/src/updates/kha/KhaUpdate.hx b/cli/src/updates/kha/KhaUpdate.hx
@@ -4,8 +4,7 @@ class KhaUpdate extends HaxeLibUpdate {
     public function new() {
         super([
             "haxeui-core",
-            "haxeui-kha",
-            "hscript"
+            "haxeui-kha"
         ]);
     }
 

diff --git a/cli/templates/android/android.hxml b/cli/templates/android/android.hxml
@@ -7,7 +7,6 @@
 
 -lib haxeui-core
 -lib haxeui-android
--lib hscript
 
 -java-lib ::ANDROID_HOME::\platforms\android-21\android.jar
 

diff --git a/cli/templates/electron-shared/electron.hxml b/cli/templates/electron-shared/electron.hxml
@@ -14,6 +14,5 @@
 
 -lib haxeui-core
 -lib haxeui-html5
--lib hscript
 
 -js build/electron/::output::.js
diff --git a/cli/templates/flixel-flash-develop/_flixel.hxproj b/cli/templates/flixel-flash-develop/_flixel.hxproj
diff --git a/cli/templates/flixel-flash-develop/flixel.hxproj b/cli/templates/flixel-flash-develop/flixel.hxproj
@@ -19,7 +19,7 @@
   </classpaths>
   <!-- Build options -->
   <build>
-    <option directives="flixel=4.5.1&#xA;openfl=8.7.0&#xA;lime=7.2.0&#xA;haxeui-core=0.0.3&#xA;hscript=2.3.0&#xA;haxeui-flixel=0.0.0&#xA;lime-openal&#xA;FLX_NO_GAMEPAD&#xA;native&#xA;lime-curl&#xA;openfl-native&#xA;lime-harfbuzz&#xA;FLX_NO_FOCUS_LOST_SCREEN&#xA;tools=7.2.0&#xA;lime-cairo&#xA;FLX_NO_DEBUG&#xA;lime-opengl&#xA;no-compilation&#xA;FLX_NO_TOUCH&#xA;lime-native&#xA;lime-vorbis&#xA;FLX_NO_SOUND_TRAY&#xA;lime-cffi&#xA;windows&#xA;desktop" />
+    <option directives="flixel=4.5.1&#xA;openfl=8.7.0&#xA;lime=7.2.0&#xA;haxeui-core=0.0.3&#xA;haxeui-flixel=0.0.0&#xA;lime-openal&#xA;FLX_NO_GAMEPAD&#xA;native&#xA;lime-curl&#xA;openfl-native&#xA;lime-harfbuzz&#xA;FLX_NO_FOCUS_LOST_SCREEN&#xA;tools=7.2.0&#xA;lime-cairo&#xA;FLX_NO_DEBUG&#xA;lime-opengl&#xA;no-compilation&#xA;FLX_NO_TOUCH&#xA;lime-native&#xA;lime-vorbis&#xA;FLX_NO_SOUND_TRAY&#xA;lime-cffi&#xA;windows&#xA;desktop" />
     <option flashStrict="False" />
     <option noInlineOnDebug="False" />
     <option mainClass="ApplicationMain" />
@@ -28,7 +28,6 @@
   </build>
   <!-- haxelib libraries -->
   <haxelib>
-    <library name="hscript" />
   </haxelib>
   <!-- Class files to compile (other referenced classes will automatically be included) -->
   <compileTargets>

diff --git a/cli/templates/flixel-shared/project.xml b/cli/templates/flixel-shared/project.xml
@@ -46,7 +46,6 @@
 	<!--In case you want to use nape with flixel-->
 	<!-- <haxelib name="nape" />     -->
 
-	<haxelib name="hscript" />
 	<haxelib name="haxeui-core" />
 	<haxelib name="haxeui-flixel" />
 

diff --git a/cli/templates/heaps/heaps-hl.hxml b/cli/templates/heaps/heaps-hl.hxml
@@ -5,7 +5,6 @@
 -lib hlsdl
 -lib haxeui-core
 -lib haxeui-heaps
--lib hscript
 
 -D resourcesPath=assets
 

diff --git a/cli/templates/heaps/heaps-js.hxml b/cli/templates/heaps/heaps-js.hxml
@@ -4,7 +4,6 @@
 -lib heaps
 -lib haxeui-core
 -lib haxeui-heaps
--lib hscript
 
 -D resourcesPath=assets
 

diff --git a/cli/templates/html5/html5.hxml b/cli/templates/html5/html5.hxml
@@ -3,6 +3,5 @@
 
 -lib haxeui-core
 -lib haxeui-html5
--lib hscript
 
 -js build/html5/::output::.js
diff --git a/cli/templates/hxwidgets-flash-develop/hxwidgets.hxproj b/cli/templates/hxwidgets-flash-develop/hxwidgets.hxproj
@@ -29,7 +29,6 @@
   <!-- haxelib libraries -->
   <haxelib>
     <library name="hxWidgets" />
-    <library name="hscript" />
     <library name="haxeui-core" />
     <library name="haxeui-hxwidgets" />
   </haxelib>

diff --git a/cli/templates/hxwidgets/hxwidgets.hxml b/cli/templates/hxwidgets/hxwidgets.hxml
@@ -4,7 +4,6 @@
 -lib haxeui-core
 -lib haxeui-hxwidgets
 -lib hxWidgets
--lib hscript
 
 -D ABI=-MD
 -D WXSTATIC

diff --git a/cli/templates/kha-shared/khafile.js b/cli/templates/kha-shared/khafile.js
@@ -5,6 +5,5 @@ project.addSources('./src');
 
 project.addLibrary('haxeui-core');
 project.addLibrary('haxeui-kha');
-project.addLibrary('hscript');
 
 resolve(project);
diff --git a/cli/templates/nme-shared/project.nmml b/cli/templates/nme-shared/project.nmml
@@ -11,7 +11,6 @@
 
     <haxelib name="nme" />
     <haxelib name="actuate" />
-    <haxelib name="hscript" />
 
     <haxelib name="haxeui-core" />
     <haxelib name="haxeui-nme" />

diff --git a/cli/templates/openfl-flash-develop/openfl.hxproj b/cli/templates/openfl-flash-develop/openfl.hxproj
@@ -28,7 +28,6 @@
   </build>
   <!-- haxelib libraries -->
   <haxelib>
-    <library name="hscript" />
   </haxelib>
   <!-- Class files to compile (other referenced classes will automatically be included) -->
   <compileTargets>

diff --git a/cli/templates/pdcurses-flash-develop/pdcurses.hxproj b/cli/templates/pdcurses-flash-develop/pdcurses.hxproj
@@ -28,7 +28,6 @@
   </build>
   <!-- haxelib libraries -->
   <haxelib>
-    <library name="hscript" />
     <library name="haxeui-core" />
     <library name="haxeui-pdcurses" />
   </haxelib>

diff --git a/cli/templates/pdcurses/pdcurses.hxml b/cli/templates/pdcurses/pdcurses.hxml
@@ -3,6 +3,5 @@
 
 -lib haxeui-core
 -lib haxeui-pdcurses
--lib hscript
 
 -cpp build/pdcurses
diff --git a/cli/templates/pixijs-flash-develop/pixijs.hxproj b/cli/templates/pixijs-flash-develop/pixijs.hxproj
@@ -31,7 +31,6 @@
     <library name="pixijs" />
     <library name="haxeui-core" />
     <library name="haxeui-pixijs" />
-    <library name="hscript" />
     <library name="actuate" />
   </haxelib>
   <!-- Class files to compile (other referenced classes will automatically be included) -->

diff --git a/cli/templates/pixijs/pixijs.hxml b/cli/templates/pixijs/pixijs.hxml
@@ -3,7 +3,6 @@
 
 -lib haxeui-core
 -lib haxeui-pixijs
--lib hscript
 -lib pixijs
 
 -js build/pixijs/::output::.js
diff --git a/cli/templates/qt-flash-develop/qt.hxproj b/cli/templates/qt-flash-develop/qt.hxproj
@@ -29,7 +29,6 @@
   <!-- haxelib libraries -->
   <haxelib>
     <library name="hxQt" />
-    <library name="hscript" />
     <library name="haxeui-core" />
     <library name="haxeui-qt" />
   </haxelib>

diff --git a/cli/templates/qt/qt.hxml b/cli/templates/qt/qt.hxml
@@ -4,7 +4,6 @@
 -lib haxeui-core
 -lib haxeui-qt
 -lib hxQt
--lib hscript
 
 -D HXCPP_M64
 

diff --git a/cli/templates/raylib-flash-develop/raylib.hxproj b/cli/templates/raylib-flash-develop/raylib.hxproj
@@ -29,7 +29,6 @@
   <!-- haxelib libraries -->
   <haxelib>
     <library name="raylib-haxe" />
-    <library name="hscript" />
     <library name="haxeui-core" />
     <library name="haxeui-raylib" />
   </haxelib>

diff --git a/cli/templates/raylib/raylib.hxml b/cli/templates/raylib/raylib.hxml
@@ -4,6 +4,5 @@
 -lib haxeui-core
 -lib haxeui-raylib
 -lib raylib-haxe
--lib hscript
 
 -cpp build/raylib
diff --git a/cli/templates/winforms-flash-develop/winforms.hxproj b/cli/templates/winforms-flash-develop/winforms.hxproj
@@ -28,7 +28,6 @@
   </build>
   <!-- haxelib libraries -->
   <haxelib>
-    <library name="hscript" />
     <library name="haxeui-core" />
     <library name="haxeui-winforms" />
   </haxelib>

diff --git a/cli/templates/winforms/winforms.hxml b/cli/templates/winforms/winforms.hxml
@@ -3,6 +3,5 @@
 
 -lib haxeui-core
 -lib haxeui-winforms
--lib hscript
 
 -cs build/winforms
diff --git a/extraParams.hxml b/extraParams.hxml
@@ -1 +0,0 @@
--lib hscript

diff --git a/haxe/ui/Toolkit.hx b/haxe/ui/Toolkit.hx
@@ -197,7 +197,7 @@ class Toolkit {
             fullScript += scriptString;
         }
 
-        component.script = fullScript;
+        //component.script = fullScript;
 
         return component;
     }
@@ -246,7 +246,7 @@ class Toolkit {
             var propValue:Dynamic = c.properties.get(propName);
             propName = ComponentFieldMap.mapField(propName);
             if (StringTools.startsWith(propName, "on")) {
-                component.addScriptEvent(propName, propValue);
+                //component.addScriptEvent(propName, propValue);
             } else {
                 propValue = TypeConverter.convertFrom(propValue);
                 Reflect.setProperty(component, propName, propValue);