Author: sfermigier
Date: Wed Feb 3 14:05:41 2010
New Revision: 906053
URL: http://svn.apache.org/viewvc?rev=906053&view=rev
Log:
Better Makefile.
Modified:
incubator/chemistry/trunk/chemistry/chemistry-shell/Makefile
incubator/chemistry/trunk/chemistry/chemistry-shell/README.txt
incubator/chemistry/trunk/chemistry/chemistry-shell/run.sh
incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/java/org/apache/chemistry/shell/cmds/cmis/SetStream.java
incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/resources/color.properties
Modified: incubator/chemistry/trunk/chemistry/chemistry-shell/Makefile
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-shell/Makefile?rev=906053&r1=906052&r2=906053&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-shell/Makefile (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-shell/Makefile Wed Feb 3
14:05:41 2010
@@ -7,23 +7,17 @@
RELEASE:=$(TODAY)
RELEASE_DIR:=cmissh-$(TODAY)
-.PHONY: all clean build release
+.PHONY: all clean build release install push
all: build test
-build:
- mvn package
-
-test:
- ./run.sh -t -b testscript
-
clean:
mvn clean
find . -name "*~" | xargs rm -f
find . -name "*,orig" | xargs rm -f
- rm -rf release
-release: clean build
+build:
+ mvn package
mkdir -p target/$(RELEASE_DIR)
cp scripts/* target/$(RELEASE_DIR)
cp README.txt target/$(RELEASE_DIR)
@@ -31,6 +25,12 @@
target/$(RELEASE_DIR)/chemistry-shell.jar
cd target ; zip -r $(RELEASE_DIR).zip $(RELEASE_DIR)
+test:
+ cd scripts ; ../run.sh -t -b testscript
+
+install: release
+ cd target/$(RELEASE_DIR) ; python install.py
+
push:
rsync -e ssh target/$(RELEASE_DIR).zip \
[email protected]:static/nuxeo.org/cmis/
Modified: incubator/chemistry/trunk/chemistry/chemistry-shell/README.txt
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-shell/README.txt?rev=906053&r1=906052&r2=906053&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-shell/README.txt (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-shell/README.txt Wed Feb 3
14:05:41 2010
@@ -13,7 +13,7 @@
there, since it is not yet released.
If you have make on you system, you can also use the following make targets:
-clean, build, test and release.
+"clean", "build", "test" and "release".
Dependencies
------------
Modified: incubator/chemistry/trunk/chemistry/chemistry-shell/run.sh
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-shell/run.sh?rev=906053&r1=906052&r2=906053&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-shell/run.sh (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-shell/run.sh Wed Feb 3
14:05:41 2010
@@ -1,5 +1,6 @@
#!/bin/sh
+BASEDIR=`dirname $0`
JAVA_OPTS="$JAVA_OPTS
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
-java ${JAVA_OPTS} -jar target/chemistry-shell-0.5-SNAPSHOT.jar $@
+java ${JAVA_OPTS} -jar $BASEDIR/target/chemistry-shell-0.5-SNAPSHOT.jar $@
Modified:
incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/java/org/apache/chemistry/shell/cmds/cmis/SetStream.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/java/org/apache/chemistry/shell/cmds/cmis/SetStream.java?rev=906053&r1=906052&r2=906053&view=diff
==============================================================================
---
incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/java/org/apache/chemistry/shell/cmds/cmis/SetStream.java
(original)
+++
incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/java/org/apache/chemistry/shell/cmds/cmis/SetStream.java
Wed Feb 3 14:05:41 2010
@@ -37,7 +37,7 @@
import org.apache.chemistry.shell.util.Path;
import org.apache.chemistry.shell.util.SimplePropertyManager;
-...@cmd(syntax="setstream target filename:file", synopsis="Set the given file
content as a stream on the current context object")
+...@cmd(syntax="setstream target:item filename:file", synopsis="Set the given
file content as a stream on the current context object")
public class SetStream extends ChemistryCommand {
@Override
Modified:
incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/resources/color.properties
URL:
http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/resources/color.properties?rev=906053&r1=906052&r2=906053&view=diff
==============================================================================
---
incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/resources/color.properties
(original)
+++
incubator/chemistry/trunk/chemistry/chemistry-shell/src/main/resources/color.properties
Wed Feb 3 14:05:41 2010
@@ -3,6 +3,7 @@
SectionRoot=cyan
TemplateRoot=cyan
Folder=blue
+folder=blue
Workspace=magenta
Section=yellow
Domain=red
