diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3c5ef0..837ca83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,98 +1,53 @@ -name: build - -on: [ push ] +name: Gradle CI + +on: + push: + branches: [ master ] + paths-ignore: [ "**.md", "schemas/**", ".editorconfig", ".gitignore", ".gitattributes" ] + pull_request: + branches: [ master ] + paths-ignore: [ "**.md", "schemas/**", ".editorconfig", ".gitignore", ".gitattributes" ] + create: + tags: jobs: - - linux: - name: 'Linux' - runs-on: ubuntu-latest - + gradle: + runs-on: "ubuntu-latest" + timeout-minutes: 30 steps: - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + + - uses: actions/setup-java@v3 with: - distribution: temurin + distribution: zulu java-version: 8 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - # - name: Build with Gradle - # run: ./gradlew build -x dokkaHtml -x dokkaHtmlJar - - uses: burrunan/gradle-cache-action@v1 - name: Build - with: - arguments: assemble #-x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar - # - name: Cleanup Gradle Cache - # # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. - # # Restoring these files from a GitHub Actions cache might cause problems for future builds. - # run: | - # rm -f ~/.gradle/caches/modules-2/modules-2.lock - # rm -f ~/.gradle/caches/modules-2/gc.properties -# - name: Show Working directory content -# run: ls -# - uses: actions/checkout@master -# with: -# repository: kotlin-graphics/mary -# path: ./mary - - name: Show ../.. directory content - run: ls ../.. -# - name: move mary up -# run: mv ./mary ../.. -# - name: Show Working directory content -# run: ls -# - name: Show ../.. directory content -# run: ls ../.. - windows: - name: 'Windows' - runs-on: windows-latest + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 - steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + - name: Setup Gradle Dependencies Cache + uses: actions/cache@v3 with: - distribution: temurin - java-version: 8 - # - name: Build with Gradle - # run: .\gradlew.bat build -x dokkaHtml -x dokkaHtmlJar - - uses: burrunan/gradle-cache-action@v1 - name: Build - with: - arguments: assemble #-x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar - # - name: Cleanup Gradle Cache - # # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. - # # Restoring these files from a GitHub Actions cache might cause problems for future builds. - # run: | - # rm -f ~/.gradle/caches/modules-2/modules-2.lock - # rm -f ~/.gradle/caches/modules-2/gc.properties + path: ~/.gradle/caches + key: gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} - mac: - name: 'Mac OS' - runs-on: macos-latest - steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + - name: Setup Gradle Wrapper Cache + uses: actions/cache@v3 with: - distribution: temurin - java-version: 8 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - # - name: Build with Gradle - # run: ./gradlew build -x dokkaHtml -x dokkaHtmlJar - - uses: burrunan/gradle-cache-action@v1 - name: Build + path: ~/.gradle/wrapper + key: gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} + + - name: Build + uses: gradle/gradle-build-action@v2 + with: + arguments: assemble + - name: Test + uses: gradle/gradle-build-action@v2 + with: + arguments: check + - name: Publish + if: startsWith(github.ref, 'refs/tags/v') + uses: gradle/gradle-build-action@v2 with: - arguments: assemble #-x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar -# - name: Cleanup Gradle Cache -# # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. -# # Restoring these files from a GitHub Actions cache might cause problems for future builds. -# run: | -# rm -f ~/.gradle/caches/modules-2/modules-2.lock -# rm -f ~/.gradle/caches/modules-2/gc.properties + arguments: publishMavenCentralPublicationToMavenCentralRepository diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml deleted file mode 100644 index d0acfdf..0000000 --- a/.github/workflows/publish-release.yml +++ /dev/null @@ -1,36 +0,0 @@ -#name: Publish release -# -#on: [push] -## release: -## types: [published] -# -#jobs: -# publish-release: -# runs-on: ubuntu-latest -# -# steps: -# - uses: FranzDiebold/github-env-vars-action@v1.2.0 -# -# - name: Checkout latest code -# uses: actions/checkout@v2 -# -# - name: Set up JDK 11 -# uses: actions/setup-java@v1 -# with: -# java-version: 11 -# -# - name: Setup build cache -# uses: actions/cache@v2 -# with: -# path: ~/.gradle/caches -# key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} -# restore-keys: | -# ${{ runner.os }}-gradle- -# -# - name: Publish artifact -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# run: | -# echo "GITHUB_SHA=$GITHUB_SHA" -# echo "GITHUB_SHA_SHORT=$GITHUB_SHA_SHORT" -# ./gradlew -Pversion=${GITHUB_SHA_SHORT} publish \ No newline at end of file diff --git a/README.md b/README.md index d463dc8..d190566 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ Small util library featuring: ### How to retrieve it: +#### mary ```kotlin repositories { maven("https://raw.githubusercontent.com/kotlin-graphics/mary/master") @@ -31,8 +32,15 @@ repositories { //github("kotlin-graphics/mary") } dependencies { - implementation("kotlin.graphics:kool:0.9.75") + implementation("kotlin.graphics:kool:0.9.79") } ``` -You can find more info by [mary](https://github.com/kotlin-graphics/mary) \ No newline at end of file +#### maven central +```kotlin +dependencies { + implementation("io.github.kotlin-graphics:kool:0.9.79") +} +``` + +You can find more info by [mary](https://github.com/kotlin-graphics/mary) diff --git a/build.gradle.kts b/build.gradle.kts index e06d79b..0e1ed9e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,12 +4,14 @@ import magik.github import org.jetbrains.kotlin.gradle.dsl.KotlinCompile import org.lwjgl.Lwjgl.Module.jemalloc import org.lwjgl.lwjgl +import java.util.* plugins { embeddedKotlin("jvm") id("org.lwjgl.plugin") version "0.0.34" id("elect86.magik") version "0.3.3" `maven-publish` + signing // id("com.github.johnrengelman.shadow") version "8.1.1" } @@ -46,4 +48,75 @@ publishing { repositories { github { domain = "kotlin-graphics/mary" } } } -java.withSourcesJar() \ No newline at end of file +java { + withJavadocJar() + withSourcesJar() +} +tasks.withType { + isFailOnError = false +} + +configure { + publications { + create("mavenCentral") { + groupId = "io.github.kotlin-graphics" + artifactId = "kool" + from(components["java"]) + versionMapping { + usage("java-api") { + fromResolutionOf("runtimeClasspath") + } + usage("java-runtime") { + fromResolutionResult() + } + } + pom { + name.set("kool") + description.set("Buffer utils") + url.set("https://github.com/kotlin-graphics/kool") + licenses { + license { + name.set("MIT") + url.set("https://choosealicense.com/licenses/mit/") + } + } + developers { + developer { + id.set("elect86") + name.set("Giuseppe Barbieri") + email.set("elect86@gmail.com") + } + developer { + id.set("bixilon") + name.set("Moritz Zwerger") + email.set("bixilon@bixilon.de") + } + } + scm { + connection.set("scm:git:https://github.com/kotlin-graphics/kool.git") + developerConnection.set("scm:git:ssh://git@github.com:kotlin-graphics/kool.git") + url.set("https://github.com/kotlin-graphics/kool") + } + } + } + } + repositories { + maven { + name = "mavenCentral" + credentials { + username = project.properties["NEXUS_USERNAME"].toString() + password = project.properties["NEXUS_PASSWORD"].toString() + } + + url = uri("https://s01.oss.sonatype.org/content/repositories/releases/") + } + } +} + +signing { + val rawKey = project.properties["SIGNING_KEY"]?.toString() ?: return@signing + val key = String(Base64.getDecoder().decode(rawKey)) // \n is not working in environment variables + val password = project.properties["SIGNING_KEY_PASSWORD"]?.toString() ?: "" + useInMemoryPgpKeys(key, password) + sign(publishing.publications["mavenCentral"]) +} diff --git a/buildSrc/src/main/kotlin/kool/conversions.kt b/buildSrc/src/main/kotlin/kool/conversions.kt index a8dc736..c680d88 100644 --- a/buildSrc/src/main/kotlin/kool/conversions.kt +++ b/buildSrc/src/main/kotlin/kool/conversions.kt @@ -14,7 +14,7 @@ fun conversions(target: File) { // suppressInlineWarning = true imports += listOf("org.lwjgl.system.MemoryUtil", - "java.nio.Buffer") + "java.nio.Buffer") for (type in types) arrays(type) @@ -27,33 +27,36 @@ fun Generator.arrays(type: String) { val TypeBuffer = type + "Buffer" val TypeArray = type + "Array" + val TypeArrayList = "ArrayList<$type>" val unsigned = type[0] == 'U' val pointer = type[0] == 'P' imports += when { unsigned -> listOf( - "kool.sliceAs", - "kool.free", - "kool.Adr", - "kool.adr", - "kool.rem", - "kool.pos", - "kool.cap", - "kool.ubuffers.$TypeBuffer", - "kool.ubuffers.as$TypeBuffer" - ) + "kool.sliceAs", + "kool.free", + "kool.Adr", + "kool.adr", + "kool.rem", + "kool.pos", + "kool.cap", + "kool.ubuffers.$TypeBuffer", + "kool.ubuffers.as$TypeBuffer" + ) + pointer -> listOf( - "org.lwjgl.PointerBuffer", - "org.lwjgl.system.Pointer", - "org.lwjgl.system.MemoryStack", - ) + "org.lwjgl.PointerBuffer", + "org.lwjgl.system.Pointer", + "org.lwjgl.system.MemoryStack", + ) + else -> listOf( - "java.nio.$TypeBuffer", - ) + "java.nio.$TypeBuffer", + ) } - fun alloc() = docs(""" - Allocates a block of memory for the array and copy the data from the array to the new allocated memory. + fun alloc(array: Boolean = true) = docs(""" + Allocates a block of memory for the array${if (array) "" else "list"} and copy the data from the array to the new allocated memory. @param: size the number of elements to allocate. @return on success, the buffer representing the memory block allocated by the function @throws `OutOfMemoryError` if the function failed to allocate the requested block of memory""") @@ -68,26 +71,33 @@ fun Generator.arrays(type: String) { val maybeU = if (unsigned && type != "UByte") "U" else "" val maybeU2 = if (unsigned) "U" else "" val maybeToUBuffer = if (unsigned) ".asUByteBuffer()" else "" - +""" - fun $TypeArray.to${maybeU}Buffer(): ${maybeU2}ByteBuffer { + for (receiver in listOf(TypeArray, TypeArrayList)) { + if (receiver == TypeArrayList) +"@JvmName(\"${type}ToBuffer\")" + +""" + fun $receiver.to${maybeU}Buffer(): ${maybeU2}ByteBuffer { val res = MemoryUtil.memAlloc(size$maybeTimes)$maybeToUBuffer for (i in indices) res.put$maybeU$t(i$maybeTimes, get(i)) return res - } - fun $TypeArray.to${maybeU}Buffer(stack: MemoryStack): ${maybeU2}ByteBuffer { + }""" + if (receiver == TypeArrayList) +"@JvmName(\"${type}ToBuffer\")" + +""" + infix fun $receiver.to${maybeU}Buffer(stack: MemoryStack): ${maybeU2}ByteBuffer { val res = stack.malloc(size$maybeTimes)$maybeToUBuffer for (i in indices) res.put$maybeU$t(i$maybeTimes, get(i)) return res }""" - alloc() - +"fun $TypeArray.to${maybeU}ByteBuffer(): ${maybeU2}ByteBuffer = to${maybeU}Buffer()" - +"fun $TypeArray.to${maybeU}ByteBuffer(stack: MemoryStack): ${maybeU2}ByteBuffer = to${maybeU}Buffer(stack)" - if ("Byte" !in type) { alloc() - +"fun $TypeArray.to$TypeBuffer(): $TypeBuffer = $TypeBuffer(size) { get(it) }" - +"fun $TypeArray.to$TypeBuffer(stack: MemoryStack): $TypeBuffer = stack.$TypeBuffer(size) { get(it) }" + if (receiver == TypeArrayList) +"@JvmName(\"${type}ToByteBuffer\")" + +"fun $receiver.to${maybeU}ByteBuffer(): ${maybeU2}ByteBuffer = to${maybeU}Buffer()" + if (receiver == TypeArrayList) +"@JvmName(\"${type}ToByteBuffer\")" + +"infix fun $receiver.to${maybeU}ByteBuffer(stack: MemoryStack): ${maybeU2}ByteBuffer = to${maybeU}Buffer(stack)" + if ("Byte" !in type) { + alloc() + +"fun $receiver.to$TypeBuffer(): $TypeBuffer = $TypeBuffer(size) { get(it) }" + +"infix fun $receiver.to$TypeBuffer(stack: MemoryStack): $TypeBuffer = stack.$TypeBuffer(size) { get(it) }" + } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0d4a951..ccebba7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index cccdd3d..79a61d4 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,105 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,19 +25,23 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,38 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/kotlin/kool/Ptr.kt b/src/main/kotlin/kool/Ptr.kt index a65eeba..4cb411d 100644 --- a/src/main/kotlin/kool/Ptr.kt +++ b/src/main/kotlin/kool/Ptr.kt @@ -1,10 +1,12 @@ @file:Suppress("NOTHING_TO_INLINE") + package kool import org.lwjgl.system.MemoryUtil +import kotlin.random.Random @JvmInline -value class Ptr(val address: Address = NULL.address) : Comparable>{ +value class Ptr(val address: Address = NULL.address) : Comparable> { inline val adr: Adr get() = address inline val isValid: Boolean @@ -14,10 +16,31 @@ value class Ptr(val address: Address = NULL.address) : Comparable toPtr(): Ptr = Ptr(adr) + val speakable: String + get() = formatUidDigit(adr) + + private fun formatUidDigit(n: ULong, level: Int = 0): String = when { + n != 0uL -> { + infix fun Int.has(other: Int): Boolean = and(other) != 0 + val letters = if (level has 1) oddLetters else evenLetters + val base = letters.length.toULong() + val s = formatUidDigit(n / base, level + 1) + s + letters[(n % base).toInt()] + } + + else -> "" + } + override fun compareTo(other: Ptr<@UnsafeVariance T>): Int = address.compareTo(other.address) + + override fun toString(): String = "0x%08X".format(address.toLong()) + ", " + speakable + companion object { val NULL: Ptr get() = Ptr(MemoryUtil.NULL.toULong()) + + private const val evenLetters = "bcdfghlmnprstwx" + private const val oddLetters = "aeiou" } } @@ -27,5 +50,11 @@ typealias Pointer = ULong typealias Adr = ULong typealias Address = ULong -//inline operator fun Ptr<*>.plus(offset: Long): Ptr<*> = plus(offset.toULong()) -//inline operator fun Ptr.plus(offset: ULong): Ptr = Ptr(address + offset) \ No newline at end of file + +fun main() { + + for (i in 0..99) { + val k = Random.nextLong(1000000, 2000000).toPtr() + println(k) + } +}