You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/06/19 04:14:06 UTC
incubator-kylin git commit: KYLIN-842 bundle commit id into binary
package for online support
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging 49ce39158 -> 1d0cd8e94
KYLIN-842 bundle commit id into binary package for online support
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1d0cd8e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1d0cd8e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1d0cd8e9
Branch: refs/heads/0.7-staging
Commit: 1d0cd8e94c7ed9609f9cc20d5903288ac4c7f520
Parents: 49ce391
Author: honma <ho...@ebay.com>
Authored: Fri Jun 19 10:13:50 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri Jun 19 10:13:50 2015 +0800
----------------------------------------------------------------------
.gitignore | 185 ++++++++++++++++++++++++------------------------
script/compress.sh | 2 +-
script/package.sh | 16 ++++-
3 files changed, 107 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d0cd8e9/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 62b46f0..9208623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,93 +1,92 @@
-### Eclipse
-*.pydevproject
-.metadata
-.gradle
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-release.properties
-.loadpath
-
-#IDEA
-*.iml
-#.settings
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# TeXlipse plugin
-.texlipse
-
-### Java
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-*.tgz
-*.tar.gz
-
-
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-
-### Origin
-# /
-.classpath
-.project
-.idea
-**/*.DS_Store
-*.jar
-*.releaseBackup
-*.log
-jdbc/kylin_jdbc.log.*
-*.DS_Store
-*.releaseBackup
-
-
-
-# .settings
-org.eclipse.m2e.core.prefs
-org.eclipse.wst.common.component
-org.eclipse.wst.common.project.facet.core.xml
-org.eclipse.wst.validation.prefs
-server/.settings/.jsdtscope
-server/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
-server/.settings/org.eclipse.wst.jsdt.ui.superType.container
-server/.settings/org.eclipse.wst.jsdt.ui.superType.name
-
-#web
-webapp/app/WEB-INF/*
-webapp/dist
-webapp/node_modules:
-webapp/CHANGELOG.md
-
-# generated files
-target
-logs
-
-# package file and folder
-tomcat
-lib
-webapp/app/components/*
+### Eclipse
+*.pydevproject
+.metadata
+.gradle
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+release.properties
+.loadpath
+
+#IDEA
+*.iml
+#.settings
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+### Java
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.tgz
+*.tar.gz
+
+
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+
+### Origin
+# /
+.classpath
+.project
+.idea
+**/*.DS_Store
+*.releaseBackup
+*.log
+jdbc/kylin_jdbc.log.*
+*.DS_Store
+
+
+
+# .settings
+org.eclipse.m2e.core.prefs
+org.eclipse.wst.common.component
+org.eclipse.wst.common.project.facet.core.xml
+org.eclipse.wst.validation.prefs
+server/.settings/.jsdtscope
+server/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+server/.settings/org.eclipse.wst.jsdt.ui.superType.container
+server/.settings/org.eclipse.wst.jsdt.ui.superType.name
+
+#web
+webapp/app/WEB-INF/*
+webapp/dist
+webapp/node_modules:
+webapp/CHANGELOG.md
+
+# generated files
+target
+logs
+
+# package file and folder
+tomcat
+lib
+webapp/app/components/*
+/commit_SHA1
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d0cd8e9/script/compress.sh
----------------------------------------------------------------------
diff --git a/script/compress.sh b/script/compress.sh
index d87eb12..ff606bc 100755
--- a/script/compress.sh
+++ b/script/compress.sh
@@ -31,7 +31,7 @@ fi
echo 'package tar.gz'
rm -rf kylin-${version}
mkdir kylin-${version}
-cp -r lib bin conf tomcat examples/sample_cube kylin-${version}
+cp -r lib bin conf tomcat examples/sample_cube commit_SHA1 kylin-${version}
find kylin-${version} -type d -exec chmod 755 {} \;
find kylin-${version} -type f -exec chmod 644 {} \;
find kylin-${version} -type f -name "*.sh" -exec chmod 755 {} \;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1d0cd8e9/script/package.sh
----------------------------------------------------------------------
diff --git a/script/package.sh b/script/package.sh
index 34d65f7..0380e6b 100755
--- a/script/package.sh
+++ b/script/package.sh
@@ -20,17 +20,26 @@ echo "Checking maven..."
if [ -z "$(command -v mvn)" ]
then
- echo "Please install maven first so that Kylin-Deploy can proceed"
+ echo "Please install maven first so that Kylin packaging can proceed"
exit 1
else
echo "maven check passed"
fi
+if [ -z "$(command -v git)" ]
+then
+ echo "Please install maven first so that Kylin packaging can proceed"
+ exit 1
+else
+ echo "git check passed"
+fi
+
+
echo "Checking npm..."
if [ -z "$(command -v npm)" ]
then
- echo "Please install npm first so that Kylin-Deploy can proceed"
+ echo "Please install npm first so that Kylin packaging can proceed"
exit 1
else
echo "npm check passed"
@@ -42,6 +51,9 @@ version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpress
echo "kylin version: ${version}"
export version
+#commit id
+git rev-parse HEAD > commit_SHA1
+
sh script/download-tomcat.sh || { exit 1; }
sh script/build.sh || { exit 1; }
sh script/prepare.sh || { exit 1; }