Moved things around

JetBrains · Nov 12, 2020 · 7d25b44 · 7d25b44
1 parent 0b4f7e6
commit 7d25b44
Show file tree

Hide file tree

Showing 292 changed files with 4,248 additions and 320 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: skija-shared
-          path: target/*.jar
+          path: shared/target/*.jar
 
   macos:
     runs-on: macos-10.15
@@ -45,12 +45,12 @@ jobs:
       - name: Download Skia
         run: |
           curl --fail --location --silent --show-error https://github.com/JetBrains/skia-build/releases/download/${{ env.skia_release }}/Skia-${{ env.skia_release }}-macos-Release-x64.zip > Skia-${{ env.skia_release }}-macos-Release-x64.zip.zip
-          unzip -qq Skia-${{ env.skia_release }}-macos-Release-x64.zip.zip -d third_party/skia
-      - run: ./script/native.sh
+          unzip -qq Skia-${{ env.skia_release }}-macos-Release-x64.zip.zip -d native/skia
+      - run: SKIA_DIR=native/skia ./native/script/build.sh
       - uses: actions/upload-artifact@v2
         with:
           name: skija-macos
-          path: target/native/*.dylib
+          path: native/build/*.dylib
       - run: ./ci/deploy_macos.sh
         env:
           SPACE_TOKEN: ${{ secrets.SPACE_TOKEN }}
@@ -70,12 +70,12 @@ jobs:
       - name: Download Skia
         run: |
           curl --fail --location --silent --show-error https://github.com/JetBrains/skia-build/releases/download/${{ env.skia_release }}/Skia-${{ env.skia_release }}-linux-Release-x64.zip > Skia-${{ env.skia_release }}-linux-Release-x64.zip.zip
-          unzip -qq Skia-${{ env.skia_release }}-linux-Release-x64.zip.zip -d third_party/skia
-      - run: ./script/native.sh
+          unzip -qq Skia-${{ env.skia_release }}-linux-Release-x64.zip.zip -d native/skia
+      - run: SKIA_DIR=native/skia ./native/script/build.sh
       - uses: actions/upload-artifact@v2
         with:
           name: skija-linux
-          path: target/native/*.so
+          path: native/build/*.so
       - run: ./ci/deploy_linux.sh
         env:
           SPACE_TOKEN: ${{ secrets.SPACE_TOKEN }}
@@ -97,13 +97,13 @@ jobs:
         shell: bash
         run: |
           curl --fail --location --silent --show-error https://github.com/JetBrains/skia-build/releases/download/${{ env.skia_release }}/Skia-${{ env.skia_release }}-windows-Release-x64.zip > Skia-${{ env.skia_release }}-windows-Release-x64.zip.zip
-          unzip -qq Skia-${{ env.skia_release }}-windows-Release-x64.zip.zip -d third_party/skia
+          unzip -qq Skia-${{ env.skia_release }}-windows-Release-x64.zip.zip -d native/skia
       - shell: bash
-        run: ./script/native.sh
+        run: SKIA_DIR=native/skia ./native/script/build.sh
       - uses: actions/upload-artifact@v2
         with:
           name: skija-windows
-          path: target/native/*.dll
+          path: native/build/*.dll
       - shell: bash
         run: ./ci/deploy_windows.sh
         env:

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
-docs/api
-out
+docs/apidocs
 target
-src_cpp/generated
+build
+/native/skia
 *.log
-/skia
 *.zip
diff --git a/.gitmodules b/.gitmodules
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Dockerfile b/Dockerfile
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Skia has a proven track record of industrial-scale project relying on it for all
 |![](extras/geometry.png)|![](extras/text.png)|
 |---|---|
 |![](extras/bitmap.png)|![](extras/pythagoras.png)|
-|![](extras/filters.png)|![](extras/shaders.png)|
+|![](extras/filters.jpg)|![](extras/shaders.png)|
 
 ## Why hand-crafted bindings
 
@@ -226,7 +226,7 @@ This will install local versions of these Skija artifacts:
 
 ```
 org.jetbrains.skija:skija-shared:0.0.0-SNAPSHOT
-org.jetbrains.skija:skija-platform:0.0.0-SNAPSHOT
+org.jetbrains.skija:skija-native:0.0.0-SNAPSHOT
 ```
 
 ### Running examples
@@ -241,7 +241,7 @@ GLFW (via LWJGL), Java and Maven:
 
 ```sh
 cd examples/lwjgl
-./script/mvn_exec.sh
+./script/exec.sh
 ```
 
 JOGL, Kotlin and Gradle:

diff --git a/TODO.md b/TODO.md
diff --git a/ci/deploy_linux.sh b/ci/deploy_linux.sh
@@ -4,5 +4,6 @@ cd "`dirname $0`/.."
 
 REVISION=$(./ci/revision.sh)
 echo "Deploying skija-linux v${REVISION}"
-sed -i -e "s/0.0.0-SNAPSHOT/$REVISION/g" -e "s/platform/linux/g" pom.native.xml
-mvn --batch-mode --file pom.native.xml --settings settings.xml -DskipTests -Dspace.username=Nikita.Prokopov -Dspace.password=${SPACE_TOKEN} deploy
+cd native
+sed -i -e "s/0.0.0-SNAPSHOT/$REVISION/g" -e "s/skija-native/skija-linux/g" pom.xml
+mvn --batch-mode --settings ../ci/settings.xml -Dspace.username=Nikita.Prokopov -Dspace.password=${SPACE_TOKEN} deploy
diff --git a/ci/deploy_macos.sh b/ci/deploy_macos.sh
@@ -4,5 +4,6 @@ cd "`dirname $0`/.."
 
 REVISION=$(./ci/revision.sh)
 echo "Deploying skija-macos v${REVISION}"
-sed -i "" -e "s/0.0.0-SNAPSHOT/$REVISION/g" -e "s/platform/macos/g" pom.native.xml
-mvn --batch-mode --file pom.native.xml --settings settings.xml -DskipTests -Dspace.username=Nikita.Prokopov -Dspace.password=${SPACE_TOKEN} deploy
+cd native
+sed -i "" -e "s/0.0.0-SNAPSHOT/$REVISION/g" -e "s/skija-native/skija-macos/g" pom.xml
+mvn --batch-mode --settings ../ci/settings.xml -Dspace.username=Nikita.Prokopov -Dspace.password=${SPACE_TOKEN} deploy
diff --git a/ci/deploy_shared.sh b/ci/deploy_shared.sh
@@ -4,5 +4,6 @@ cd "`dirname $0`/.."
 
 REVISION=$(./ci/revision.sh)
 echo "Deploying skija-shared v${REVISION}"
-sed -i "s/0.0.0-SNAPSHOT/$REVISION/g" pom.shared.xml
-mvn --batch-mode --file pom.shared.xml --settings settings.xml -DskipTests -Dspace.username=Nikita.Prokopov -Dspace.password=${SPACE_TOKEN} deploy
+cd shared
+sed -i "s/0.0.0-SNAPSHOT/$REVISION/g" pom.xml
+mvn --batch-mode --settings ../ci/settings.xml -DskipTests -Dspace.username=Nikita.Prokopov -Dspace.password=${SPACE_TOKEN} deploy
diff --git a/ci/deploy_windows.sh b/ci/deploy_windows.sh
@@ -4,5 +4,6 @@ cd "`dirname $0`/.."
 
 REVISION=$(./ci/revision.sh)
 echo "Deploying skija-windows v${REVISION}"
-sed -i -e "s/0.0.0-SNAPSHOT/$REVISION/g" -e "s/platform/windows/g" pom.native.xml
-mvn --batch-mode --file pom.native.xml --settings settings.xml -DskipTests -Dspace.username=Nikita.Prokopov -Dspace.password=${SPACE_TOKEN} deploy
+cd native
+sed -i -e "s/0.0.0-SNAPSHOT/$REVISION/g" -e "s/skija-native/skija-windows/g" pom.xml
+mvn --batch-mode --settings ../ci/settings.xml -Dspace.username=Nikita.Prokopov -Dspace.password=${SPACE_TOKEN} deploy
diff --git a/settings.xml → ci/settings.xml b/settings.xml → ci/settings.xml
diff --git a/examples/jogl/build.gradle b/examples/jogl/build.gradle
@@ -36,8 +36,7 @@ kotlin {
                 implementation kotlin('stdlib-jdk8')
                 api files("$joglDir/gluegen-rt.jar")
                 api files("$joglDir/jogl-all.jar")
-                api "org.jetbrains.skija:skija-shared:0.0.0-SNAPSHOT"
-                api "org.jetbrains.skija:skija-platform:0.0.0-SNAPSHOT"
+                api "org.jetbrains.skija:skija-native:0.0.0-SNAPSHOT"
 
                 implementation files("$joglDir/gluegen-rt-natives-macosx-universal.jar")
                 implementation files("$joglDir/jogl-all-natives-macosx-universal.jar")

diff --git a/examples/jogl/src/jvmMain/kotlin/org/jetbrains/skija/example/jogl/SkiaWindow.kt b/examples/jogl/src/jvmMain/kotlin/org/jetbrains/skija/example/jogl/SkiaWindow.kt
@@ -8,7 +8,6 @@ import org.jetbrains.skija.FramebufferFormat
 import org.jetbrains.skija.Canvas
 import org.jetbrains.skija.Context
 import org.jetbrains.skija.ColorSpace
-import org.jetbrains.skija.Library
 import org.jetbrains.skija.Surface
 import org.jetbrains.skija.SurfaceOrigin
 import org.jetbrains.skija.SurfaceColorFormat

diff --git a/examples/lwjgl/pom.xml b/examples/lwjgl/pom.xml
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>org.jetbrains.skija</groupId>
             <!-- <artifactId>${skija.artifactId}</artifactId> -->
-            <artifactId>skija-platform</artifactId>
+            <artifactId>skija-native</artifactId>
             <version>0.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>

diff --git a/examples/lwjgl/script/build.sh b/examples/lwjgl/script/build.sh
@@ -2,8 +2,6 @@
 set -o errexit -o nounset -o pipefail
 cd "`dirname $0`/.."
 
-mkdir -p target
-
 LWJGL_VER=3.2.3
 OS=`uname`
 if [[ "$OS" == 'Linux' ]]; then
@@ -23,7 +21,7 @@ LWJGL_LIBS=(
 
 HAS_LWJLG=true
 LOMBOK=~/.m2/repository/org/projectlombok/lombok/1.18.12/lombok-1.18.12.jar
-CLASSPATH=target/classes:../../target/classes:$LOMBOK
+CLASSPATH=target/classes:../../shared/target/classes:$LOMBOK
 
 for LIB in "${LWJGL_LIBS[@]}"; do
     JAR=~/.m2/repository/org/lwjgl/$LIB/$LWJGL_VER/$LIB-$LWJGL_VER.jar

diff --git a/examples/lwjgl/script/clean.sh b/examples/lwjgl/script/clean.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -o errexit -o nounset -o pipefail
+cd "`dirname $0`/.."
+
+rm -rf target
diff --git a/examples/lwjgl/script/mvn_exec.sh → examples/lwjgl/script/exec.sh b/examples/lwjgl/script/mvn_exec.sh → examples/lwjgl/script/exec.sh
diff --git a/examples/lwjgl/script/run.sh b/examples/lwjgl/script/run.sh
@@ -2,8 +2,6 @@
 set -o errexit -o nounset -o pipefail
 cd "`dirname $0`/.."
 
-mkdir -p target
-
 LWJGL_VER=3.2.3
 OS=`uname`
 JVM_OPTS=''
@@ -24,7 +22,7 @@ LWJGL_LIBS=(
 )
 
 HAS_LWJLG=true
-CLASSPATH=target/classes:../../target/classes
+CLASSPATH=target/classes:../../native/build:../../shared/target/classes
 
 for LIB in "${LWJGL_LIBS[@]}"; do
     JAR=~/.m2/repository/org/lwjgl/$LIB/$LWJGL_VER/$LIB-$LWJGL_VER.jar

diff --git a/examples/metal/.ninja_deps b/examples/metal/.ninja_deps
diff --git a/examples/metal/.ninja_log b/examples/metal/.ninja_log
@@ -0,0 +1,2 @@
+# ninja log v5
+1	88	1605009592209784602	CMakeFiles/metal.dir/CMakeFiles/3.17.1/CompilerIdCXX/CMakeCXXCompilerId.cpp.o	22c6ff4ffaa3cdf6