rename controls interface to system_controls

bebcky · bebcky · commit f5beaaf26b07 · 2020-12-30T11:53:12.000+11:00
diff --git a/examples/bare_wasm_cpp/CMakeLists.txt b/examples/bare_wasm_cpp/CMakeLists.txt
@@ -10,7 +10,7 @@ add_custom_target(
     "\"${CMAKE_CURRENT_SOURCE_DIR}/index.html\""
     "\"${CMAKE_CURRENT_SOURCE_DIR}/index.js\""
     "\"${CMAKE_CURRENT_SOURCE_DIR}/index.css\""
-    "\"${ConstraintSDK_DIR}/lib/controls.js\""
+    "\"${ConstraintSDK_DIR}/lib/system_controls.js\""
     "\"${CMAKE_CURRENT_BINARY_DIR}\""
 )
 
diff --git a/examples/bare_wasm_cpp/index.html b/examples/bare_wasm_cpp/index.html
@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>Test</title>
         <link rel="stylesheet" href="./index.css">
-        <script src="./controls.js"></script>
+        <script src="./system_controls.js"></script>
     </head>
     <body>
         <script src="./index.js"></script>
diff --git a/examples/bare_wasm_cpp/main.cpp b/examples/bare_wasm_cpp/main.cpp
@@ -3,7 +3,7 @@
 #include "debug.h"
 #include "environment.h"
 #include "constraint_arithmetic.h"
-#include "controls.h"
+#include "system_controls.h"
 
 const size_t max_allocator_space = 4096;
 
diff --git a/examples/emscripten_cpp/CMakeLists.txt b/examples/emscripten_cpp/CMakeLists.txt
@@ -10,7 +10,7 @@ add_custom_target(
     "\"${CMAKE_CURRENT_SOURCE_DIR}/index.html\""
     "\"${CMAKE_CURRENT_SOURCE_DIR}/index.js\""
     "\"${CMAKE_CURRENT_SOURCE_DIR}/index.css\""
-    "\"${ConstraintSDK_DIR}/lib/controls.js\""
+    "\"${ConstraintSDK_DIR}/lib/system_controls.js\""
     "\"${CMAKE_CURRENT_BINARY_DIR}\""
 )
 
diff --git a/examples/emscripten_cpp/index.html b/examples/emscripten_cpp/index.html
@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>Test</title>
         <link rel="stylesheet" href="./index.css">
-        <script src="./controls.js"></script>
+        <script src="./system_controls.js"></script>
     </head>
     <body>
         <script type='text/javascript'>
diff --git a/examples/emscripten_cpp/main.cpp b/examples/emscripten_cpp/main.cpp
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include "environment.h"
 #include "constraint_arithmetic.h"
-#include "controls.h"
+#include "system_controls.h"
 
 struct String {
     const char *data;
diff --git a/examples/emscripten_csharp/Example.csproj b/examples/emscripten_csharp/Example.csproj
@@ -12,11 +12,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.ILCompiler.LLVM" Version="6.0.0-*" />
     <ProjectReference Include="../../sdk/lib/csharp/ConstraintArithmetic/ConstraintArithmetic.csproj" />
-    <ProjectReference Include="../../sdk/lib/csharp/Controls/Controls.csproj" />
+    <ProjectReference Include="../../sdk/lib/csharp/SystemControls/SystemControls.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="index.html;index.js;index.css;$(ConstraintSDKPath)/lib/controls.js">
+    <Content Include="index.html;index.js;index.css;$(ConstraintSDKPath)/lib/system_controls.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/examples/emscripten_csharp/Program.cs b/examples/emscripten_csharp/Program.cs
@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 using ConstraintArithmetic;
-using static Controls;
+using static SystemControls;
 
 public static class Program {
     public static int Count = 0;
diff --git a/examples/emscripten_csharp/index.html b/examples/emscripten_csharp/index.html
@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>Test</title>
         <link rel="stylesheet" href="./index.css">
-        <script src="./controls.js"></script>
+        <script src="./system_controls.js"></script>
     </head>
     <body>
         <script type='text/javascript'>
diff --git a/sdk/CMakeLists.txt b/sdk/CMakeLists.txt
@@ -29,8 +29,8 @@ ExternalProject_Add(
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
 
 install(
-    FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib/browser/controls.js
+    DIRECTORY
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib/browser/
     DESTINATION lib
 )
 
diff --git a/sdk/include/system_controls.h b/sdk/include/system_controls.h
diff --git a/sdk/lib/browser/system_controls.js b/sdk/lib/browser/system_controls.js
diff --git a/sdk/lib/csharp/SystemControls/SystemControls.cs b/sdk/lib/csharp/SystemControls/SystemControls.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-public static class Controls {
+public static class SystemControls {
     [DllImport("__Internal", CallingConvention = CallingConvention.Cdecl)]
     public static extern float get_text_width(
         byte[] text_data,
diff --git a/sdk/lib/csharp/SystemControls/SystemControls.csproj b/sdk/lib/csharp/SystemControls/SystemControls.csproj

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ add_custom_target(`
`10`	`10`	`"\"${CMAKE_CURRENT_SOURCE_DIR}/index.html\""`
`11`	`11`	`"\"${CMAKE_CURRENT_SOURCE_DIR}/index.js\""`
`12`	`12`	`"\"${CMAKE_CURRENT_SOURCE_DIR}/index.css\""`
`13`		`- "\"${ConstraintSDK_DIR}/lib/controls.js\""`
	`13`	`+ "\"${ConstraintSDK_DIR}/lib/system_controls.js\""`
`14`	`14`	`"\"${CMAKE_CURRENT_BINARY_DIR}\""`
`15`	`15`	`)`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ ExternalProject_Add(`
`29`	`29`	`install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)`
`30`	`30`
`31`	`31`	`install(`
`32`		`- FILES`
`33`		`- ${CMAKE_CURRENT_SOURCE_DIR}/lib/browser/controls.js`
	`32`	`+ DIRECTORY`
	`33`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/lib/browser/`
`34`	`34`	`DESTINATION lib`
`35`	`35`	`)`
`36`	`36`