summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-vcltesttool/files
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2009-07-19 22:23:57 +0000
committerMaho Nakata <maho@FreeBSD.org>2009-07-19 22:23:57 +0000
commit4aaac129f031022f789f82442a90c7328d4c213b (patch)
tree6f08d581bde385847ecee8119c00fe208b1d5946 /editors/openoffice.org-vcltesttool/files
parent- Update to 1.0.1 (diff)
Add openjdk as a possible jdk.
Suggested by: jkim Funded by: OpenOffice.org community
Notes
Notes: svn path=/head/; revision=238078
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files')
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-i10362826
1 files changed, 26 insertions, 0 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i103628 b/editors/openoffice.org-vcltesttool/files/patch-i103628
new file mode 100644
index 000000000000..c3846bc27ae2
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i103628
@@ -0,0 +1,26 @@
+very strange workaround indeed.
+
+--- qadevOOo/runner/makefile.mk 2009-07-04 12:13:19.000000000 +0900
++++ qadevOOo/runner/makefile.mk 2009-07-19 09:37:44.000000000 +0900
+@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
+
+ JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
+ JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
++JAR=${JAVA_HOME}/bin/jar
+
+ # --- Targets ------------------------------------------------------
+ .IF "$(SOLAR_JAVA)"=="TRUE"
+@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
+
+ # LLA: parameter v is only verbose, need too long!
+ OWNJAR: LIGHT
+- jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
++ ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+
+ # LLA: parameter v is only verbose, need too long!
+ LIGHT:
+- jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
++ ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+
+ .ELSE
+ all: