Skip to content

GitLab

A
ardublockly
Commit 77bcc2b9 authored by carlosperate's avatar carlosperate
Browse files
Options

Replace other mentions of ArdublocklyServer with ardublocklyserver.

parent 28475e5b
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
ardublockly/classic/index.html
View file @ 77bcc2b9
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<!-- Load Blockly's language strings --> <!-- Load Blockly's language strings -->
<script src="../../blockly/msg/js/en.js"></script> <script src="../../blockly/msg/js/en.js"></script>
<!-- Arduino Server Compiler --> <!-- Arduino Server Compiler -->
<script src="../../ArdublocklyServer/js/ArduServerCompiler.js"></script> <script src="../../ardublocklyserver/js/ArduServerCompiler.js"></script>
<!-- Prettify --> <!-- Prettify -->
<link rel="stylesheet" href="../../blockly/demos/prettify.css"> <link rel="stylesheet" href="../../blockly/demos/prettify.css">
<script src="../../blockly/demos/prettify.js"></script> <script src="../../blockly/demos/prettify.js"></script>
......
ardublockly/classic/settings.html
View file @ 77bcc2b9
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<title>Ardublockly: Arduino Code Settings</title> <title>Ardublockly: Arduino Code Settings</title>
<link rel="stylesheet" href="settings.css"> <link rel="stylesheet" href="settings.css">
<!-- Arduino Server Compiler --> <!-- Arduino Server Compiler -->
<script src="../../ArdublocklyServer/js/ArduServerCompiler.js"></script> <script src="../../ardublocklyserver/js/ArduServerCompiler.js"></script>
</head> </head>
<body> <body>
......
ardublockly/index.html
View file @ 77bcc2b9
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<script src="../blockly/generators/arduino/variables.js"></script> <script src="../blockly/generators/arduino/variables.js"></script>
<script src="../blockly/msg/js/en.js"></script> <script src="../blockly/msg/js/en.js"></script>
<!-- Arduino Server Compiler --> <!-- Arduino Server Compiler -->
<script src="../ArdublocklyServer/js/ArduServerCompiler.js"></script> <script src="../ardublocklyserver/js/ArduServerCompiler.js"></script>
<!-- Arduino Material design app --> <!-- Arduino Material design app -->
<link href="ardublockly.css" rel="stylesheet" media="screen,projection"> <link href="ardublockly.css" rel="stylesheet" media="screen,projection">
<script src="ardublockly_design.js"></script> <script src="ardublockly_design.js"></script>
......
ardublocklyserver/pyserialports/README.md
View file @ 77bcc2b9
# Pyserial modules # Pyserial modules
To be able to run this application without having to install additional packages, we have included these modules with the Ardublockly ArdublocklyServer Python package. To be able to run this application without having to install additional packages, we have included these modules with the Ardublockly ardublocklyserver Python package.
These modules have been extracted and modified from the pyserial package These modules have been extracted and modified from the pyserial package
version 2.7: [https://pypi.python.org/pypi/pyserial](https://pypi.python.org/pypi/pyserial) version 2.7: [https://pypi.python.org/pypi/pyserial](https://pypi.python.org/pypi/pyserial)
......
ardublocklyserver/tests/compilersettings_test.py
View file @ 77bcc2b9
...@@ -70,7 +70,7 @@ class ServerCompilerSettingsTestCase(unittest.TestCase): ...@@ -70,7 +70,7 @@ class ServerCompilerSettingsTestCase(unittest.TestCase):
mock_os_path_exists.return_value = True mock_os_path_exists.return_value = True
new_dir = os.getcwd() new_dir = os.getcwd()
ServerCompilerSettings().compiler_dir = new_dir ServerCompilerSettings().compiler_dir = new_dir
self.assertEqual(new_dir, ServerCompilerSettings().compiler_dir) self.assertTrue(new_dir in ServerCompilerSettings().compiler_dir)
self.assertNotEqual(original_dir, ServerCompilerSettings().compiler_dir) self.assertNotEqual(original_dir, ServerCompilerSettings().compiler_dir)
@mock.patch('ardublocklyserver.compilersettings.os.path.exists') @mock.patch('ardublocklyserver.compilersettings.os.path.exists')
...@@ -78,7 +78,7 @@ class ServerCompilerSettingsTestCase(unittest.TestCase): ...@@ -78,7 +78,7 @@ class ServerCompilerSettingsTestCase(unittest.TestCase):
mock_os_path_exists.return_value = True mock_os_path_exists.return_value = True
new_dir = os.path.join(os.getcwd(), 'arduino.exe') new_dir = os.path.join(os.getcwd(), 'arduino.exe')
ServerCompilerSettings().compiler_dir = new_dir ServerCompilerSettings().compiler_dir = new_dir
self.assertEqual(new_dir, ServerCompilerSettings().compiler_dir) self.assertTrue(new_dir in ServerCompilerSettings().compiler_dir)
# #
# Testing the settings file # Testing the settings file
......
circle.yml
View file @ 77bcc2b9
...@@ -33,7 +33,7 @@ dependencies: ...@@ -33,7 +33,7 @@ dependencies:
# Install tkinker and mock # Install tkinker and mock
- sudo apt-get install -y python-support - sudo apt-get install -y python-support
- sudo apt-get install python-tk - sudo apt-get install python-tk
- pip install mock - sudo pip install mock
# Install node.js # Install node.js
- curl -sL https://deb.nodesource.com/setup_0.12 | sudo bash - - curl -sL https://deb.nodesource.com/setup_0.12 | sudo bash -
......
package/build_py2exe.py
View file @ 77bcc2b9
...@@ -43,7 +43,7 @@ project_root_dir = \ ...@@ -43,7 +43,7 @@ project_root_dir = \
os.path.dirname(os.path.realpath(__file__))) # folder dir of this os.path.dirname(os.path.realpath(__file__))) # folder dir of this
executable_dir = os.path.join(project_root_dir, exec_folder_name) executable_dir = os.path.join(project_root_dir, exec_folder_name)
# Enable the ArdublocklyServer package access the sys path for py2exe to find # Enable the ardublocklyserver package access the sys path for py2exe to find
sys.path.append(project_root_dir) sys.path.append(project_root_dir)
...@@ -122,7 +122,7 @@ def get_py2exe_options(): ...@@ -122,7 +122,7 @@ def get_py2exe_options():
"bundle_files": 3, "bundle_files": 3,
"skip_archive": True, "skip_archive": True,
"optimize": 0, "optimize": 0,
"packages": ["ArdublocklyServer"], "packages": ["ardublocklyserver"],
"dll_excludes": dll_excludes, "dll_excludes": dll_excludes,
"excludes": excludes}} "excludes": excludes}}
return py2exe_options return py2exe_options
......
package/pyinstaller.spec
View file @ 77bcc2b9
...@@ -8,7 +8,7 @@ block_cipher = None ...@@ -8,7 +8,7 @@ block_cipher = None
a = Analysis(['start.py'], a = Analysis(['start.py'],
pathex=None, pathex=None,
hiddenimports=["ArdublocklyServer", "cefpython3", "wx"], hiddenimports=["ardublocklyserver", "cefpython3", "wx"],
hookspath=None, hookspath=None,
runtime_hooks=None, runtime_hooks=None,
excludes=None) excludes=None)
......
start_cef.py
View file @ 77bcc2b9
...@@ -36,7 +36,7 @@ import codecs ...@@ -36,7 +36,7 @@ import codecs
import inspect import inspect
import platform import platform
import traceback import traceback
from ArdublocklyServer.BlocklyHTTPServer import start_server from ardublocklyserver.server import start_server
# Needed for packaging the application on self contained executable # Needed for packaging the application on self contained executable
__file__ = sys.argv[0] __file__ = sys.argv[0]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment