Merge pull request #918 from vorth/jsweet-dead

Bypassing JSweet

.github/workflows/online.yml

@@ -25,6 +25,8 @@ jobs:
       with:
         lfs: 'true'
 
+<<<<<<< HEAD
+=======
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
@@ -100,6 +102,7 @@ jobs:
         ./gradlew publishToMavenLocal -DskipSigning=true
         cd ..
 
+>>>>>>> main
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v4
       with:

.gitignore

@@ -51,7 +51,7 @@ react-vzome-*.tgz
 build.properties
 online/jsweetOut
 transpiled-java.js
-core-java.js
+# core-java.js
 desktop-java.js
 vzome-react-vzome-*.tgz
 online/dist
@@ -62,8 +62,8 @@ online-app.zip
 online.tgz
 deploy-to-dreamhost.sh
 *.pem
-online/src/worker/legacy/candies
-online/src/ui/legacy/candies
+# online/src/worker/legacy/candies
+# online/src/ui/legacy/candies
 
 desktop-errors.txt
 

cicd/jsweet-legacy-code.bash

@@ -1,5 +1,14 @@
 #!/bin/bash
 
+# JSweet has effectively died.  Keeping it working was already far too complex,
+# and now their Artifactory server is gone.
+
+# I'm now committing the generated Typescript and Javascript, and we'll move
+# forward with manual porting for any changes we do to the Java source.
+
+# See online/build.gradle for more details.
+
+
 if [ -z ${REVISION+x} ]; then
   echo "This script is not meant to run as a top-level entry point.  Use online.bash."
   exit 1

cicd/online.bash

@@ -94,11 +94,13 @@ buildForProduction() {
 }
 
 prepareJSweet(){
-  source cicd/prepare-jsweet.bash || exit $?
+  banner 'We are no longer using JSweet. See online/build.gradle for more details.'
+  # source cicd/prepare-jsweet.bash || exit $?
 }
 
 jsweet(){
-  source cicd/jsweet-legacy-code.bash || exit $?
+  banner 'We are no longer using JSweet. See online/build.gradle for more details.'
+  # source cicd/jsweet-legacy-code.bash || exit $?
 }
 
 devJava(){

cicd/prepare-jsweet.bash

@@ -1,5 +1,14 @@
 #!/bin/bash
 
+# JSweet has effectively died.  Keeping it working was already far too complex,
+# and now their Artifactory server is gone.
+
+# I'm now committing the generated Typescript and Javascript, and we'll move
+# forward with manual porting for any changes we do to the Java source.
+
+# See online/build.gradle for more details.
+
+
 if [ -z ${REVISION+x} ]; then
   echo "This script is not meant to run as a top-level entry point."
   exit 1

online/build.gradle

@@ -1,3 +1,18 @@
+
+// JSweet has effectively died.  Keeping it working was already far too complex,
+// and now their Artifactory server is gone.
+
+// I'm now committing the generated Typescript and Javascript, and we'll move
+// forward with manual porting for any changes we do to the Java source.
+
+// This build script now will only see use when we finally want to port some of
+// the excluded core edits or exporters, e.g. POVRayExporter.java.  Even then
+// we will probably need to bypass Gradle and use Maven or just a raw Java command-line.
+
+// For that eventuality, I have made a local copy of the relevant contents of my local
+// Maven repository.  See ~/vZome/jsweet-maven-repo
+
+
 buildscript {
 	repositories {
     mavenLocal()