From ae9177d6453ce23ddb33927a5e88360255efa1fc Mon Sep 17 00:00:00 2001 From: Kun Zhang Date: Tue, 31 Mar 2015 18:26:28 -0700 Subject: Switch from Gradle to Maven. --- protoc-artifacts/build-protoc.sh | 7 +- protoc-artifacts/build.gradle | 110 -------------- protoc-artifacts/gradle/wrapper/gradle-wrapper.jar | Bin 51018 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - protoc-artifacts/gradlew | 164 --------------------- protoc-artifacts/gradlew.bat | 90 ----------- protoc-artifacts/pom.xml | 113 ++++++++++++++ protoc-artifacts/settings.gradle | 1 - 8 files changed, 119 insertions(+), 372 deletions(-) delete mode 100644 protoc-artifacts/build.gradle delete mode 100644 protoc-artifacts/gradle/wrapper/gradle-wrapper.jar delete mode 100644 protoc-artifacts/gradle/wrapper/gradle-wrapper.properties delete mode 100755 protoc-artifacts/gradlew delete mode 100644 protoc-artifacts/gradlew.bat create mode 100644 protoc-artifacts/pom.xml delete mode 100644 protoc-artifacts/settings.gradle (limited to 'protoc-artifacts') diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh index f166c8b6..4e0e5498 100755 --- a/protoc-artifacts/build-protoc.sh +++ b/protoc-artifacts/build-protoc.sh @@ -1,5 +1,8 @@ #!/bin/bash +cd $(dirname "$0") +WORKING_DIR=$(pwd) + # Override the default value set in configure.ac that has '-g' which produces # huge binary. export CXXFLAGS="-DNDEBUG" @@ -16,4 +19,6 @@ if [[ "$(uname)" == CYGWIN* ]]; then export CXXCPP=i686-pc-mingw32-cpp fi -cd $(dirname "$0")/.. && ./configure --disable-shared && make clean && make +cd "$WORKING_DIR"/.. && ./configure --disable-shared && make clean && make && + cd "$WORKING_DIR" && mkdir -p target && + (cp ../src/protoc target/protoc.exe || cp ../src/protoc.exe target/protoc.exe) diff --git a/protoc-artifacts/build.gradle b/protoc-artifacts/build.gradle deleted file mode 100644 index de93cb02..00000000 --- a/protoc-artifacts/build.gradle +++ /dev/null @@ -1,110 +0,0 @@ -apply plugin: 'maven' -apply plugin: 'java' -apply plugin: 'osdetector' -apply plugin: 'signing' - -description = 'Pre-compiled protoc (protobuf compiler) artifacts' - -group = 'com.google.protobuf' -version = '3.0.0-alpha-3-pre' - -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.google.gradle:osdetector-gradle-plugin:1.2.1' - } -} - -repositories { - mavenCentral() -} - -signing { - required false - sign configurations.archives -} - -def artifactFile = 'target/protoc.exe' as File - -task buildProtoc(type: Exec) { - commandLine 'bash', 'build-protoc.sh' -} - -task prepareArtifact(type: Copy, dependsOn: buildProtoc) { - from '../src/' as File - into artifactFile.parent - include 'protoc', 'protoc.exe' - rename 'protoc', 'protoc.exe' -} - -artifacts { - archives(artifactFile) { - classifier osdetector.classifier - type "exe" - extension "exe" - builtBy prepareArtifact - } -} - -uploadArchives.repositories.mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - if (rootProject.hasProperty("ossrhUsername") && rootProject.hasProperty("ossrhPassword")) { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - } - - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - if (rootProject.hasProperty("ossrhUsername") && rootProject.hasProperty("ossrhPassword")) { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - } -} - -[ - install.repositories.mavenInstaller, - uploadArchives.repositories.mavenDeployer, -]*.pom*.whenConfigured { pom -> - pom.project { - name "$project.group:$project.name" - description project.description - url 'https://github.com/google/protobuf' - - scm { - connection 'scm:svn:https://github.com/google/protobuf.git' - developerConnection 'scm:svn:git@github.com:google/protobuf.git' - url 'https://github.com/google/protobuf' - } - - licenses { - license { - name 'BSD 3-Clause' - url 'http://opensource.org/licenses/BSD-3-Clause' - } - } - - developers { - developer { - id "com.google.protobuf" - name "Protobuf Contributors" - email "protobuf@googlegroups.com" - url "https://github.com/google/protobuf" - organization = "Google, Inc." - organizationUrl "https://www.google.com" - } - } - } -} - -// Exe files are skipped by Maven by default. Override it. -[ - install.repositories.mavenInstaller, - uploadArchives.repositories.mavenDeployer, -]*.addFilter('all') {artifact, file -> true} - -task wrapper(type: Wrapper) { - gradleVersion = '2.0' -} diff --git a/protoc-artifacts/gradle/wrapper/gradle-wrapper.jar b/protoc-artifacts/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index c97a8bdb..00000000 Binary files a/protoc-artifacts/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/protoc-artifacts/gradle/wrapper/gradle-wrapper.properties b/protoc-artifacts/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index b125b424..00000000 --- a/protoc-artifacts/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Mar 25 13:05:27 PDT 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/protoc-artifacts/gradlew b/protoc-artifacts/gradlew deleted file mode 100755 index 91a7e269..00000000 --- a/protoc-artifacts/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# 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 -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# 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\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -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" - 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" ] ; 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"` - - # 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 - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/protoc-artifacts/gradlew.bat b/protoc-artifacts/gradlew.bat deleted file mode 100644 index aec99730..00000000 --- a/protoc-artifacts/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@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 - -@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 DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@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 Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_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 - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -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% - -: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 diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml new file mode 100644 index 00000000..51b48c92 --- /dev/null +++ b/protoc-artifacts/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + + com.google + google + 1 + + com.google.protobuf + protoc + 3.0.0-alpha-3-pre + pom + Protobuf Compiler + + Protobuf Compiler (protoc) is a compiler for .proto files. It generates + language-specific code for Protobuf messages and RPC interfaces. + + 2008 + https://developers.google.com/protocol-buffers/ + + + New BSD license + http://www.opensource.org/licenses/bsd-license.php + repo + + + + https://github.com/google/protobuf + + scm:git:https://github.com/google/protobuf.git + + + + + + kr.motd.maven + os-maven-plugin + 1.2.3.Final + + + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + compile + + exec + + + + + bash + + build-protoc.sh + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + attach-artifacts + package + + attach-artifact + + + + + ${basedir}/target/protoc.exe + ${os.detected.classifier} + exe + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.3 + true + + sonatype-nexus-staging + https://oss.sonatype.org/ + false + + + + + diff --git a/protoc-artifacts/settings.gradle b/protoc-artifacts/settings.gradle deleted file mode 100644 index 2a18bb00..00000000 --- a/protoc-artifacts/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'protoc' -- cgit v1.2.3