Skip to content

Commit

Permalink
[WIP] Initial structure for jphp package template (jppt)
Browse files Browse the repository at this point in the history
  • Loading branch information
MWGuy committed Aug 30, 2019
1 parent b8ac786 commit 04aed96
Show file tree
Hide file tree
Showing 6 changed files with 308 additions and 6 deletions.
32 changes: 32 additions & 0 deletions packager/buildSrc/TemplatePlugin.php
@@ -0,0 +1,32 @@
<?php

use packager\cli\Console;
use packager\Event;

/**
* jppt - tool to easily creating custom projects with templates (jppm packages)
*
* @jppm-task tasks
* @jppm-task init
*/
class TemplatePlugin
{
/**
* @jppm-description show all tasks
* @param Event $event
*/
function tasks(Event $event)
{
$defaultPlugin = new DefaultPlugin();
$defaultPlugin->tasks($event);
}

/**
* @jppm-description init project with template
* @param Event $event
*/
function init(Event $event)
{

}
}
4 changes: 2 additions & 2 deletions packager/package.php.yml
@@ -1,5 +1,5 @@
name: jppm
version: 0.4.1
version: 0.4.2

plugins: [GitHub, Hub, Doc]

Expand All @@ -14,7 +14,7 @@ github:
> JPHP Package Manager v%version%
**What's new**
+ Upgradle gradle to 5.1.1 (java 11 support)
+ jppt - tool to easily creating custom projects with templates
**Downloads**
+ For Windows: [JPPM Windows Installer](%github.address%/releases/download/jppm-%version%/jppm-setup-%version%.exe)
Expand Down
172 changes: 172 additions & 0 deletions packager/scripts/jppt
@@ -0,0 +1,172 @@
#!/usr/bin/env sh

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# 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
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="jppt"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
echo "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# 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
;;
esac

CLASSPATH=$APP_HOME/packager-all.jar:$APP_HOME/buildSrc

# 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"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
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
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
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

# 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\""
fi
i=$((i+1))
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 -DtemplateManager=true -classpath "\"$CLASSPATH\"" php.runtime.launcher.Launcher "$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")"
fi

exec "$JAVACMD" "$@"
86 changes: 86 additions & 0 deletions packager/scripts/jppt.bat
@@ -0,0 +1,86 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@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=

@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

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
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=%*

goto execute

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\packager-all.jar;%APP_HOME%\buildSrc

@rem Execute jppm
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% -DtemplateManager=true -cp "%CLASSPATH%" php.runtime.launcher.Launcher %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="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

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
3 changes: 0 additions & 3 deletions packager/src-php/JPHP-INF/.bootstrap.php
@@ -1,9 +1,6 @@
<?php

use packager\cli\ConsoleApp;
use packager\Plugin;
use php\lib\fs;
use php\lib\str;

global $app;

Expand Down
17 changes: 16 additions & 1 deletion packager/src-php/packager/cli/ConsoleApp.php
Expand Up @@ -3,6 +3,7 @@
namespace packager\cli;

use DefaultPlugin;
use TemplatePlugin;
use function flow;
use function is_array;
use const JPHP_VERSION;
Expand Down Expand Up @@ -89,7 +90,16 @@ function main(array $args)
Console::log("args = " . var_export($args, true));
}

$this->loadPlugin(DefaultPlugin::class);
if ($this->isTemplateManager())
{
if (fs::exists(Package::FILENAME)) {
Console::error(Package::FILENAME . " already exists");
}

$this->loadPlugin(TemplatePlugin::class);
} else {
$this->loadPlugin(DefaultPlugin::class);
}

if ($this->getPackage()) {
$this->loadPlugins();
Expand Down Expand Up @@ -158,6 +168,11 @@ public function isDebug(): bool
return $this->debug;
}

public function isTemplateManager(): bool
{
return boolval(System::getProperty("templateManager", false));
}

function invokeTask(string $task, array $args, ...$flags)
{
if ($this->taskUpDate[$task . '#' . str::join($flags, ',')]) {
Expand Down

1 comment on commit 04aed96

@dim-s
Copy link
Member

@dim-s dim-s commented on 04aed96 Aug 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a separeted comand for templates is so complex for jppm. Maybe run template comand via the jppm comand? It's like the maven project templates and other build system, not only nginx. Nginx is not a build system and we don't simulate its system.

Please sign in to comment.