[openoffice] 02/04: Fix version script path.

[damjan]

This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch scons-build
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit ead77f05278d696109d843e1e4da6d988cd0575a
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Sat Feb 8 11:59:39 2020 +0200

    Fix version script path.
    
    Patch by: me
---
 .../java/org/apache/openoffice/gotoSCons/SConsConverter.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/SConsConverter.java 
b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/SConsConverter.java
index 147b328..c3f1d50 100644
--- 
a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/SConsConverter.java
+++ 
b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/SConsConverter.java
@@ -111,13 +111,14 @@ public class SConsConverter {
         
         String versionScript = library.getVersionScript();
         if (versionScript != null) {
-            int firstSlash = versionScript.indexOf('/');
-            if (firstSlash < 0) {
-                throw new Exception("Invalid filename " + versionScript);
+            if (versionScript.startsWith("$(SRCDIR)/")) {
+                int firstSlash = versionScript.indexOf('/');
+                int secondSlash = versionScript.indexOf('/', firstSlash + 1);
+                versionScript = versionScript.substring(secondSlash + 1);
             }
 
             out.println(String.format("%s.SetVersionScript('%s')",
-                    library.getName(), versionScript.substring(firstSlash + 
1)));
+                    library.getName(), versionScript));
         }
 
         out.println(String.format("%s.InstallTo('${OUTDIR}/lib')", 
library.getName()));