Test Pull

.gitattributes

@@ -0,0 +1,5 @@
+# default behavior
+* text=auto
+
+# Make sure linux shell scripts maintain their line endings
+*.sh text eol=lf

.github/workflows/gradle.yml

@@ -0,0 +1,36 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+    - uses: release-drafter/release-drafter@v5
+        # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+        # with:
+        #   config-name: my-config.yml
+        #   disable-autolabeler: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        USERNAME: ${{ github.actor }}
+        releaseRepoToken: ${{ secrets.GITHUB_TOKEN }}
+    - name: Grant execute permission for gradlew
+      run: chmod +x ./host/gradlew
+    - name: Build distribution
+      run: ./host/gradlew fullRelease

.gitignore

@@ -0,0 +1,6 @@
+host/resourcesnew/printflow/js/printerconfig.js
+host/photocentric/printflow/js/printerconfig.js
+*.keystore
+host/bin/log.err
+/bin/
+/.gradle/

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "host/resourcesnew/slacer"]
-	path = host/resourcesnew/slacer
-	url = https://github.com/Kudo3D/SLAcer.js
+[submodule "host/resourcesnew/slacer"]
+path = host/resourcesnew/slacer
+url = https://github.com/Kudo3D/SLAcer.js

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Photonic3D-Dev</name>
+	<comment>Project Photonic3D-Dev created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,18 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.arguments=
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.java.home=null
+connection.jvm.arguments=
+connection.project.dir=
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=false
+project.path=\:
+show.console.view=false
+show.executions.view=false

.travis.yml

@@ -29,7 +29,7 @@ before_deploy:
 deploy:
   - provider: releases
     skip_cleanup: true
-    prerelease: false
+    prerelease: true
     api_key: "$GITHUB_ACCESS_TOKEN"
     file_glob: true
     file: "${RELEASE_PKG_FILE}"
@@ -41,5 +41,6 @@ deploy:
 #    user: $BINTRAY_USER
 #    key: $BINTRAY_API_KEY
 #    dry-run: $SKIP_BINTRAY
+#
 #    on:
 #      all_branches: true

host/BuildCWH.xml

@@ -27,35 +27,11 @@
 		<zip destfile="${deployedServerZipFile}">
 			<zipfileset dir="build" includes="**/build.number"/>
 			<zipfileset dir="build/install/photonic3d/lib" includes="**/*.properties"/>
-			<zipfileset dir="os" prefix="os" includes="**/*"/>
 			<zipfileset dir="bin"/>
 			<zipfileset dir="resources" prefix="resources" includes="**/*"/>
 			<zipfileset dir="resourcesnew" prefix="resourcesnew" includes="**/*"/>
+			<zipfileset dir="printflow" prefix="printflow" includes="**/*"/>
 			<zipfileset dir="build/install/photonic3d/lib" prefix="lib" includes="**/*.jar"/>
 		</zip>
-		<!--
-		<zip destfile="${deployedTestZipFile}">
-			<zipfileset dir="build" includes="**/build.number"/>
-			<zipfileset dir="build/install/photonic3d/lib" includes="**/*.properties"/>
-			<zipfileset dir="os" prefix="os" includes="**/*"/>
-			<zipfileset dir="bin"/>
-			<zipfileset dir="resources" prefix="resources" includes="**/*"/>
-			<zipfileset dir="resourcesnew" prefix="resourcesnew" includes="**/*"/>
-			<zipfileset dir="build/install/photonic3d/lib" prefix="lib" includes="**/*.jar"/>
-		</zip>
-		<zip destfile="${deployedClientZipFile}">
-			<zipfileset dir="build" includes="**/build.number"/>
-			<zipfileset dir="build/libs" prefix="lib" includes="**/*.jar"/>
-			<zipfileset dir="libs/cling" prefix="lib" includes="**/*.jar"/>
-			<zipfileset dir="libs/jsch" prefix="lib" includes="**/*.jar"/>
-			<zipfileset dir="libs/commons-logging" prefix="lib" includes="**/*.jar"/>
-			<zipfileset dir="libs/log4j" prefix="lib" includes="**/*.jar"/>
-			<zipfileset dir="libs/resteasy" prefix="lib" includes="**/jackson-annotations*.jar"/>
-			<zipfileset dir="libs/resteasy" prefix="lib" includes="**/jackson-core*.jar"/>
-			<zipfileset dir="libs/resteasy" prefix="lib" includes="**/jackson-databind*.jar"/>
-			<zipfileset dir="bin" includes="**/browseprinter.*"/>
-			<zipfileset dir="bin" includes="**/slicebrowser.*"/>
-		</zip>
-		-->
 	</target>
 </project>

host/bin/start.bat

@@ -69,17 +69,17 @@ IF "%tag_name%"=="~13" (
 	echo Download URL = %browser_download_url%
 	%CD%\curl\bin\curl -L %browser_download_url% > Update.zip
 	unzip -o Update
-	java -Dlog4j.configurationFile=log4j2.properties -Djava.library.path=os/win64 -cp lib/*;. org.area515.resinprinter.server.Main > log.out 2> log.err
+	java -Dlog4j.configurationFile=log4j2.properties -cp lib/*;. org.area515.resinprinter.server.Main > log.out 2> log.err
 ) ELSE (
 	IF "%tag_name%"=="%repoVersion%" (
 		echo No update needed
-		java -Dlog4j.configurationFile=log4j2.properties -Djava.library.path=os/win64 -cp lib/*;. org.area515.resinprinter.server.Main > log.out 2> log.err
+		java -Dlog4j.configurationFile=log4j2.properties -cp lib/*;. org.area515.resinprinter.server.Main > log.out 2> log.err
 	) ELSE (
 		echo Download URL = %browser_download_url%
 		%CD%\curl\bin\curl -L %browser_download_url% > Update.zip
 		unzip -o Update
 		del -Q Update.zip
-		java -Dlog4j.configurationFile=log4j2.properties -Djava.library.path=os/win64 -cp lib/*;. org.area515.resinprinter.server.Main > log.out 2> log.err
+		java -Dlog4j.configurationFile=log4j2.properties -cp lib/*;. org.area515.resinprinter.server.Main > log.out 2> log.err
 	)
 )
 

host/bin/start.sh

@@ -3,6 +3,14 @@
 if [[ $UID != 0 ]]; then
     echo "Please run this script with sudo:"
     echo "sudo $0 $*"
+    echo "Here are some other usages:"
+    echo "sudo ./start.sh area515/Photonic3D"
+    echo "sudo ./start.sh WesGilster/Photonic3D TestKit"
+    echo "sudo ./start.sh WesGilster/Photonic3D force"
+    echo "sudo ./start.sh WesGilster/Photonic3D debug"
+    echo "sudo ./start.sh WesGilster/Photonic3D forceprerelease"
+    echo "sudo ./start.sh WesGilster/Photonic3D prerelease"
+    echo "sudo ./start.sh WesGilster/Photonic3D debugprerelease"
     exit 1
 fi
 
@@ -53,11 +61,6 @@ elif [ "${cpu}" = "aarch64" ]; then
 	javaURL="http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jdk-8u101-linux-arm64-vfp-hflt.tar.gz"
 fi
 
-if [ ! -f "/usr/lib/jni/librxtxSerial.so" ]; then
-	echo Installing RxTx
-	apt-get install --yes --force-yes librxtx-java
-fi
-
 #This application will always need to have the display set to the following
 export DISPLAY=:0.0
 xinitProcess=`ps -ef | grep grep -v | grep xinit`
@@ -110,10 +113,13 @@ fi
 echo Checking for new version from Github Repo: ${repo}
 cd ${installDirectory}
 LOCAL_TAG=$(grep repo.version build.number | cut -d = -f 2 | tr -d '\r')
-NETWORK_TAG=$(curl -L -s https://api.github.com/repos/${repo}/releases/latest | grep 'tag_name' | cut -d\" -f4)
-
+if [ "$2" == "forceprerelease" -o "$2" == "prerelease" -o "$2" == "debugprerelease" ]; then
+   NETWORK_TAG=$(curl -L -s https://api.github.com/repos/${repo}/releases | grep -m 1 -B 30 '"prerelease": true' | grep 'tag_name' | cut -d\" -f4)
+else
+   NETWORK_TAG=$(curl -L -s https://api.github.com/repos/${repo}/releases/latest | grep 'tag_name' | cut -d\" -f4)
+fi
 echo Local Tag: ${LOCAL_TAG}
-echo Network Tag: ${NETWORK_TAG}
+echo Latest Network Tag: ${NETWORK_TAG}
 
 if [ -f ${downloadPrefix}.*.zip ]; then
 	OFFLINE_FILE=$(ls ${downloadPrefix}.*.zip)
@@ -129,14 +135,19 @@ if [ -f ${downloadPrefix}.*.zip ]; then
 	rm ${OFFLINE_FILE}
 elif [ -z "${NETWORK_TAG}" ]; then
 	echo "Couldn't fetch version from GitHub, launching existing install."
-elif [ "${NETWORK_TAG}" != "${LOCAL_TAG}" -o "$2" == "force" ]; then
-	echo Installing latest version of ${downloadPrefix}: ${NETWORK_TAG}
-
-	DL_URL=$(curl -L -s https://api.github.com/repos/${repo}/releases/latest | grep 'browser_' | cut -d\" -f4 | grep -- -${NETWORK_TAG})
+elif [ "${NETWORK_TAG}" != "${LOCAL_TAG}" -o "$2" == "force" -o "$2" == "forceprerelease" ]; then
+	if [ "$2" == "forceprerelease" -o "$2" == "debugprerelease" -o "$2" == "prerelease" ]; then
+		DL_URL=$(curl -L -s https://api.github.com/repos/${repo}/releases | grep -m 1 -A 36 '"prerelease": true' | grep 'browser_' | cut -d\" -f4 | grep -- -${NETWORK_TAG})
+	else 
+		DL_URL=$(curl -L -s https://api.github.com/repos/${repo}/releases/latest | grep 'browser_' | cut -d\" -f4 | grep -- -${NETWORK_TAG})
+	fi
+
+	echo Installing from: ${DL_URL}
+
 	DL_FILE=${DL_URL##*/}
 	rm -f "/tmp/${DL_FILE}"
 	wget -P /tmp "${DL_URL}"
-  if [ $? -ne 0 ]; then
+  	if [ $? -ne 0 ]; then
 		echo "wget of ${DL_FILE} failed. Aborting update."
 		exit 1
 	fi
@@ -172,7 +183,7 @@ if [ ! -f "/etc/init.d/cwhservice" ]; then
 	update-rc.d cwhservice defaults
 fi
 
-echo Determinging if one time install has occurred
+echo Determining if one time install has occurred
 performedOneTimeInstall=$(grep performedOneTimeInstall ${CONFIG_PROPS} | awk -F= '{print $2}')
 if [ -f "oneTimeInstall.sh" -a [${performedOneTimeInstall} != "true"] ]; then
 	./oneTimeInstall.sh
@@ -182,16 +193,16 @@ if [ -f "eachStart.sh" ]; then
 	./eachStart.sh
 fi
 
-if [ "$2" == "debug" ]; then
+if [ "$2" == "debug" -o "$2" == "debugprerelease" ]; then
 	pkill -9 -f "org.area515.resinprinter.server.Main"
-	echo "Starting printer host server($2)"
-	java -Xmx512m -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=4000,suspend=n -Dlog4j.configurationFile=debuglog4j2.properties -Djava.library.path=/usr/lib/jni:os/Linux/${cpu} -cp lib/*:. org.area515.resinprinter.server.Main > log.out 2> log.err &
+	echo Starting printer host server in debug mode
+	java -Xmx512m -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=4000,suspend=n -Dlog4j.configurationFile=debuglog4j2.properties -Djava.library.path=/usr/lib/jni -cp .:lib/* org.area515.resinprinter.server.Main > log.out 2> log.err &
 elif [ "$2" == "TestKit" ]; then
 	pkill -9 -f "org.area515.resinprinter.test.HardwareCompatibilityTestSuite"
 	echo Starting test kit
-	java -Xmx512m -Dlog4j.configurationFile=testlog4j2.properties -Djava.library.path=/usr/lib/jni:os/Linux/${cpu} -cp lib/*:. org.junit.runner.JUnitCore org.area515.resinprinter.test.HardwareCompatibilityTestSuite &
+	java -Xmx512m -Dlog4j.configurationFile=testlog4j2.properties -Djava.library.path=/usr/lib/jni -cp .:lib/* org.junit.runner.JUnitCore org.area515.resinprinter.test.HardwareCompatibilityTestSuite &
 else
 	pkill -9 -f "org.area515.resinprinter.server.Main"
 	echo Starting printer host server
-	java -Xmx512m -Dlog4j.configurationFile=log4j2.properties -Djava.library.path=/usr/lib/jni:os/Linux/${cpu} -cp lib/*:. org.area515.resinprinter.server.Main > log.out 2> log.err &
+	java -Xmx512m -Dlog4j.configurationFile=log4j2.properties -Djava.library.path=/usr/lib/jni -cp .:lib/* org.area515.resinprinter.server.Main > log.out 2> log.err &
 fi

host/bin/startdevprerelease.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./start.sh "WesGilster/Creation-Workshop-Host" prerelease