[Mondrian] Eigenbase perforce change 14470 for review
Julian Hyde
jhyde at pentaho.com
Sun Jul 24 14:15:25 EDT 2011
We have managed to avoid spaces in source-controlled files until now. It
makes it easier to use linux utilities such as xargs.
Can you find a way to avoid spaces in the "Schema Workbench.app" directory?
Julian
> -----Original Message-----
> From: Will Gorman [mailto:wgorman at pentaho.org]
> Sent: Wednesday, July 20, 2011 11:16 AM
> To: Ajit Joglekar; Aaron Phillips; Andreas Voss; Ezequiel
> Cuellar; Eric McDermid; Julian Hyde; John V. Sichi; Mat
> Lowery; Matt Campbell; Rushan Chen; Robin Tharappel; Will Gorman
> Subject: Eigenbase perforce change 14470 for review
>
> http://p4web.eigenbase.org/@md=d&c=6PU@/14470?ac=10
>
> Change 14470 by wgorman at guest.willgorman.pentaho on
> 2011/07/20 11:15:54
>
> MONDRIAN: PSW-112 - Ramaiz has created a .App for
> Schema Workbench to allow for easy execution of the client
> tool on the Mac. We've also added a tar.gz dist of the workbench.
>
> Affected files ...
>
> ... //open/mondrian/build.properties#28 edit
> ... //open/mondrian/build.xml#244 edit
> ... //open/mondrian/workbench/Schema
> Workbench.app/Contents/Info.plist#1 add
> ... //open/mondrian/workbench/Schema
> Workbench.app/Contents/MacOS/JavaApplicationStub#1 add
> ... //open/mondrian/workbench/Schema
> Workbench.app/Contents/PkgInfo#1 add
> ... //open/mondrian/workbench/Schema
> Workbench.app/Contents/Resources/schema.icns#1 add
> ... //open/mondrian/workbench/ivy.xml#14 edit
> ... //open/mondrian/workbench/plugins/launcher.properties#1 add
> ... //open/mondrian/workbench/set-pentaho-env.bat#3 edit
> ... //open/mondrian/workbench/set-pentaho-env.sh#3 edit
>
> Differences ...
>
> ==== //open/mondrian/build.properties#28 (ktext) ====
>
> 1c1
> < # $Id: //open/mondrian/build.properties#27 $
> ---
> > # $Id: //open/mondrian/build.properties#28 $
> 31a32
> > dependency.pentaho-launcher.revision=1.0.0
>
> ==== //open/mondrian/build.xml#244 (ktext) ====
>
> 2c2
> < == $Id: //open/mondrian/build.xml#243 $
> ---
> > == $Id: //open/mondrian/build.xml#244 $
> 69c69,70
> < <property name="workbench.dist.file"
> value="${workbench.dist.name}.zip"/>
> ---
> > <property name="workbench.zip-dist.file"
> value="${workbench.dist.name}.zip"/>
> > <property name="workbench.tar-dist.file"
> value="${workbench.dist.name}.tar.gz"/>
> 1649,1650c1650,1651
> < <delete file="${dist.dir}/${workbench.dist.file}"/>
> < <zip zipfile="${dist.dir}/${workbench.dist.file}">
> ---
> > <delete file="${dist.dir}/${workbench.zip-dist.file}"/>
> > <zip zipfile="${dist.dir}/${workbench.zip-dist.file}">
> 1655,1668c1656,1670
> < ${doc.dir}/**/*.pdf,
> < lib/mondrian.jar,
> < lib/workbench.jar,
> < lib/log4j.jar,
> < lib/x*.jar,
> < lib/eigenbase*.jar,
> < lib/commons*.jar,
> < lib/javacup.jar,
> < lib/jlfgr.jar,
> < lib/olap4j.jar,
> < lib/*.dtd,
> < lib/*.xsd,
> < demo/FoodMart.xml,
> < LICENSE.html"
> ---
> > ${doc.dir}/**/*.pdf,
> > lib/mondrian.jar,
> > lib/workbench.jar,
> > lib/log4j.jar,
> > lib/x*.jar,
> > lib/eigenbase*.jar,
> > lib/commons*.jar,
> > lib/javacup.jar,
> > lib/jlfgr.jar,
> > lib/olap4j.jar,
> > lib/launcher.jar,
> > lib/*.dtd,
> > lib/*.xsd,
> > demo/FoodMart.xml,
> > LICENSE.html"
> 1670,1673c1672,1675
> < **/*~,
> < **/_vti*/*,
> < **/*.psp,
> < ${doc.dir}/api/src-html/**/*"/>
> ---
> > **/*~,
> > **/_vti*/*,
> > **/*.psp,
> > ${doc.dir}/api/src-html/**/*"/>
> 1682a1685,1728
> > <delete file="${dist.dir}/${workbench.tar-dist.file}"/>
> > <tar destfile="${dist.dir}/${workbench.tar-dist.file}"
> longfile="gnu" compression="gzip">
> > <tarfileset dir="." prefix="${workbench.dist.name}"
> mode="755" includes="*.sh"/>
> > <tarfileset dir="."
> prefix="${workbench.dist.name}" includes="
> > ${doc.dir}/**/*.pdf,
> > lib/mondrian.jar,
> > lib/workbench.jar,
> > lib/log4j.jar,
> > lib/x*.jar,
> > lib/eigenbase*.jar,
> > lib/commons*.jar,
> > lib/javacup.jar,
> > lib/jlfgr.jar,
> > lib/olap4j.jar,
> > lib/launcher.jar,
> > lib/*.dtd,
> > lib/*.xsd,
> > demo/FoodMart.xml,
> > LICENSE.html"
> > excludes="
> > **/*~,
> > **/_vti*/*,
> > **/*.psp,
> > **/*.sh,
> > **/JavaApplicationStub,
> > ${doc.dir}/api/src-html/**/*"/>
> > <tarfileset mode="755"
> > dir="workbench"
> > prefix="${workbench.dist.name}">
> > <include name="**/*.sh" />
> > <include name="**/JavaApplicationStub" />
> > </tarfileset>
> > <tarfileset
> > dir="workbench"
> > prefix="${workbench.dist.name}">
> > <include name="**/*" />
> > <exclude name="**/*.sh" />
> > <exclude name="**/JavaApplicationStub" />
> > </tarfileset>
> > <tarfileset
> > dir="src/main"
> > prefix="${workbench.dist.name}/src"
> > includes="mondrian/gui/**/*"/>
> > </tar>
> 1740c1786
> < <!-- End build.xml -->
> ---
> > <!-- End build.xml -->
> ==== //open/mondrian/workbench/ivy.xml#14 (ktext) ====
>
> 4c4
> < == $Id: //open/mondrian/workbench/ivy.xml#13 $
> ---
> > == $Id: //open/mondrian/workbench/ivy.xml#14 $
> 44a45,47
> >
> > <!-- internal runtime dependencies -->
> > <dependency org="pentaho" name="launcher"
> rev="${dependency.pentaho-launcher.revision}" />
> 46d48
> <
>
> ==== //open/mondrian/workbench/set-pentaho-env.bat#3 (ktext) ====
>
> 14,23c14,23
> < rem 1. environment variable PENTAHO_JAVA_HOME - path to Java home
> < rem 2. jre folder at current folder level
> < rem 3. java folder at current folder level
> < rem 4. jre folder one level up
> < rem 5. java folder one level up
> < rem 6. jre folder two levels up
> < rem 7. java folder two levels up
> < rem 8. environment variable JAVA_HOME - path to Java home
> < rem 9. environment variable JRE_HOME - path to Java home
> < rem 10. argument #1 - path to Java home
> ---
> > rem 1. argument #1 - path to Java home
> > rem 2. environment variable PENTAHO_JAVA_HOME - path to Java home
> > rem 3. jre folder at current folder level
> > rem 4. java folder at current folder level
> > rem 5. jre folder one level up
> > rem 6 java folder one level up
> > rem 7. jre folder two levels up
> > rem 8. java folder two levels up
> > rem 9. environment variable JAVA_HOME - path to Java home
> > rem 10. environment variable JRE_HOME - path to Java home
> 44a45
> > if exist "%~1\bin\%__LAUNCHER%" goto gotValueFromCaller
> 46,51c47,52
> < if exist "%~dp0jre" goto gotJreCurrentFolder
> < if exist "%~dp0java" goto gotJavaCurrentFolder
> < if exist "%~dp0..\jre" goto gotJreOneFolderUp
> < if exist "%~dp0..\java" goto gotJavaOneFolderUp
> < if exist "%~dp0..\..\jre" goto gotJreTwoFolderUp
> < if exist "%~dp0..\..\java" goto gotJavaTwoFolderUp
> ---
> > if exist "%~dp0jre\bin\%__LAUNCHER%" goto gotJreCurrentFolder
> > if exist "%~dp0java\bin\%__LAUNCHER%" goto gotJavaCurrentFolder
> > if exist "%~dp0..\jre\bin\%__LAUNCHER%" goto gotJreOneFolderUp
> > if exist "%~dp0..\java\bin\%__LAUNCHER%" goto gotJavaOneFolderUp
> > if exist "%~dp0..\..\jre\bin\%__LAUNCHER%" goto gotJreTwoFolderUp
> > if exist "%~dp0..\..\java\bin\%__LAUNCHER%" goto gotJavaTwoFolderUp
> 54d54
> < if exist "%~1" goto gotValueFromCaller
>
> ==== //open/mondrian/workbench/set-pentaho-env.sh#3 (kxtext) ====
>
> 14,23c14,23
> < # 1. environment variable PENTAHO_JAVA_HOME - path to Java home
> < # 2. jre folder at current folder level
> < # 3. java folder at current folder level
> < # 4. jre folder one level up
> < # 5. java folder one level up
> < # 6. jre folder two levels up
> < # 7. java folder two levels up
> < # 8. environment variable JAVA_HOME - path to Java home
> < # 9. environment variable JRE_HOME - path to Java home
> < # 10. argument #1 - path to Java home
> ---
> > # 1. argument #1 - path to Java home
> > # 2. environment variable PENTAHO_JAVA_HOME - path to Java home
> > # 3. jre folder at current folder level
> > # 4. java folder at current folder level
> > # 5. jre folder one level up
> > # 6 java folder one level up
> > # 7. jre folder two levels up
> > # 8. java folder two levels up
> > # 9. environment variable JAVA_HOME - path to Java home
> > # 10. environment variable JRE_HOME - path to Java home
> 47c47,51
> < if [ -n "$PENTAHO_JAVA_HOME" ]; then
> ---
> > if [ -n "$1" ] && [ -d "$1" ] && [ -x "$1"/bin/$__LAUNCHER ]; then
> > echo "DEBUG: Using value ($1) from calling script"
> > _PENTAHO_JAVA_HOME="$1"
> > _PENTAHO_JAVA="$_PENTAHO_JAVA_HOME"/bin/$__LAUNCHER
> > elif [ -n "$PENTAHO_JAVA_HOME" ]; then
> 51c55
> < elif [ -d "$DIR/jre" ]; then
> ---
> > elif [ -x "$DIR/jre/bin/$__LAUNCHER" ]; then
> 55c59
> < elif [ -d "$DIR/java" ]; then
> ---
> > elif [ -x "$DIR/java/bin/$__LAUNCHER" ]; then
> 59c63
> < elif [ -d "$DIR/../jre" ]; then
> ---
> > elif [ -x "$DIR/../jre/bin/$__LAUNCHER" ]; then
> 63c67
> < elif [ -d "$DIR/../java" ]; then
> ---
> > elif [ -x "$DIR/../java/bin/$__LAUNCHER" ]; then
> 67c71
> < elif [ -d "$DIR/../../jre" ]; then
> ---
> > elif [ -x "$DIR/../../jre/bin/$__LAUNCHER" ]; then
> 71c75
> < elif [ -d "$DIR/../../java" ]; then
> ---
> > elif [ -x "$DIR/../../java/bin/$__LAUNCHER" ]; then
> 83,86d86
> < elif [ -n "$1" ] && [ -d "$1" ] && [ -x
> "$1"/bin/$__LAUNCHER ]; then
> < echo "DEBUG: Using value ($1) from calling script"
> < _PENTAHO_JAVA_HOME="$1"
> < _PENTAHO_JAVA="$_PENTAHO_JAVA_HOME"/bin/$__LAUNCHER
>
More information about the Mondrian
mailing list