Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Small-JS/SmallJS
Browse files Browse the repository at this point in the history
  • Loading branch information
FunctionPoint committed Oct 16, 2024
2 parents 4771e37 + b63decc commit 7e4f93e
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Examples/Electron/Electron.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ Note: \
Only the functionality needed for this example is currently implemented in the Electron base classes.\
They are by no means complete yet. If you want to contribute, feel free :).

## Linux
## Linux - Ubuntu

Ubuntu 24.04 restricts the use of sandboxes, preventing Electron startup.
Ubuntu restricts the use of sandboxes, preventing Electron startup.
To lift this restrictions that execute:

`sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0`
2 changes: 2 additions & 0 deletions Examples/Electron/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ echo "Pre-launch script"
./preLaunch.sh

# Run tests
# If this fails on Ubuntu, you maybe need to run this:
# sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0

cd out
../node_modules/.bin/electron main.js -test
2 changes: 1 addition & 1 deletion Examples/NodeGui/NodeGui.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ though most styling of them can be done through farmiliar CSS.

Just open the file `NodeGui.code-workspace` with VSCode and press `[F5]`.

### Runing on Ubuntu 24.04
### Runing on Ubuntu

To be able to start NodeGui on the QT 6.6.x platform on Ubuntu 24.04,\
the folowing library needs to be installed manually:
Expand Down
2 changes: 2 additions & 0 deletions Examples/NodeGui/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@ tsc
node ../../Compiler/out/App.js ../../Smalltalk/Core ../../Smalltalk/Node ../../Smalltalk/NodeGui src out

# Run tests
# If this fails on Ubuntu, you maybe need to run this:
# sudo apt-get install libxcb-cursor0

node_modules/.bin/qode out/App.js -test
1 change: 1 addition & 0 deletions Examples/Pharo/Server/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
# pharoVm=$HOME"/Documents/Pharo/vms/120-x64/Pharo.app"
# pharoImage=$HOME"/Documents/Pharo/images/Pharo12/Pharo12.image"
# pharoWeb=`pwd`"/../Client/web"

25 changes: 13 additions & 12 deletions Node/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,24 @@ cd "$(dirname "$0")"

echo "==== Node"

# Compile TypeScript
echo "tsc Node"
tsc

# Compile Smalltalk
node ../Compiler/out/App.js ../Smalltalk/Core ../Smalltalk/Node src out

# Check and run .env file
if
! test -f .env
then
echo "Warning: '.env' file missing. See '.env.example'."
else
set -o allexport
source .env
set +o allexport
echo "Skipping browser tests."
exit 0
fi

# Compile TypeScript
echo "tsc Node"
tsc

# Compile Smalltalk
node ../Compiler/out/App.js ../Smalltalk/Core ../Smalltalk/Node src out
set -o allexport
source .env
set +o allexport

# Run unit tests
./start.sh
node out/App.js

0 comments on commit 7e4f93e

Please sign in to comment.