a.binder преди 7 години
родител
ревизия
97b4efd280

+ 20 - 5
SE/schema/WPS_Functions/html2image/build_html2image.dita.PRODUCT.xml

@@ -10,11 +10,15 @@
          basedir="/Users/a.binder/procesy5-dita-templates-druki/xmlschema_procesy5/src-xmlschema/public_html"
          name="html2image.PRODUCT">
    
+   <include file="../build.WPS_Functions.PRODUCT.xml"/>
+   
    <property name="html2image.basedir"
-             location="/Users/a.binder/procesy5-dita-templates-druki/xmlschema_procesy5/src-xmlschema/public_html/WPS_Functions/html2image"/>
+      location="${WPS_Functions.basedir}/html2image"/>
    <property name="html2image.temp"
-             location="/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/html2image"/>
-      
+      location="${WPS_Functions.temp}/html2image"/>
+   <property name="html2image.repository"
+      location="${WPS_Functions.repository}/html2image"/>
+   
    
       
    <!--#64 apiname-->
@@ -25,8 +29,19 @@
    <!--#72__AC cmd ; 
    id=ditafiles_d14e17 @format=ditamap @scope=-->
    <!--#82-B-1100 due to not @format=dita not keyword-->
-      <property name="html2image.application.google_chrome.install_dest_on_macOS"
-             location="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"/>
+   
+   <condition property="html2image.application.google_chrome.install_dest_on_macOS" value="/usr/bin/google-chrome">
+      <available file="/usr/bin/google-chrome"/>
+   </condition>
+   <condition property="html2image.application.google_chrome.install_dest_on_macOS" value="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome">
+      <available file="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"/>
+   </condition>
+   
+   <fail unless="html2image.application.google_chrome.install_dest_on_macOS"> Not found google-chrome nor on test paths
+      /usr/bin/google-chrome
+      /Applications/Google Chrome.app/Contents/MacOS/Google Chrome
+   </fail>
+      
    <!--#64 apiname-->
    <!--#64 info-->
    <!--#64 syntaxdiagram-->

+ 2 - 2
SE/schema/WPS_Functions/html2image/build_html2image.dita.xml

@@ -7,10 +7,10 @@
          xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/"
          xmlns:p5ant="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache.public/ant/ant.xsd"
          xmlns:d2a="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/dita-to-ant/d2a.xsd"
-         basedir="/Users/a.binder/procesy5-dita-templates-druki/xmlschema_procesy5/src-xmlschema/public_html"
+         basedir="../../."
          default="html2image"
          name="html2image">
-   <include file="/Users/a.binder/procesy5-dita-templates-druki/xmlschema_procesy5/src-xmlschema/public_html/WPS_Functions/html2image/build_html2image.dita.PRODUCT.xml"
+   <include file="build_html2image.dita.PRODUCT.xml"
             as="PRODUCT"/>
    
    

+ 12 - 6
SE/schema/WPS_Functions/html2image/build_html2image_0.dita.PRODUCT.xml

@@ -7,12 +7,17 @@
          xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/"
          xmlns:p5ant="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache.public/ant/ant.xsd"
          xmlns:d2a="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/dita-to-ant/d2a.xsd"
-         basedir="/Users/a.binder/procesy5-dita-templates-druki/xmlschema_procesy5/src-xmlschema/public_html"
+         basedir="../../."
          name="html2image.PRODUCT">
+      
+   <include file="build_html2image.dita.PRODUCT.xml"/>
+      
    <property name="html2image.basedir"
-             location="/Users/a.binder/procesy5-dita-templates-druki/xmlschema_procesy5/src-xmlschema/public_html/WPS_Functions/html2image"/>
+         location="${WPS_Functions.basedir}/html2image"/>
    <property name="html2image.temp"
-             location="/opt/local/pl.procesy5/p5build_SE/temp/WPS_Functions/html2image"/>
+         location="${WPS_Functions.temp}/html2image"/>
+      <property name="html2image.repository"
+            location="${WPS_Functions.repository}/html2image"/>
    <!--#64 apiname-->
    <!--#64 syntaxdiagram-->
    <!--#64 apiname-->
@@ -21,8 +26,9 @@
    <!--#72__AC cmd ; 
    id=ditafiles_d14e17 @format=ditamap @scope=-->
    <!--#82-B-1100 due to not @format=dita not keyword-->
-   <property name="application.google_chrome.install_dest_on_macOS"
-             location="/Applications/Google%20Chrome.app/Contents/MacOS/Google\ Chrome "/>
+   <!--<property name="application.google_chrome.install_dest_on_macOS"
+             location="/Applications/Google%20Chrome.app/Contents/MacOS/Google\ Chrome "/>-->
+   
    <!--#64 apiname-->
    <!--#64 info-->
    <!--#64 syntaxdiagram-->
@@ -51,5 +57,5 @@
    id=ditafiles_d14e17 @format=ditamap @scope= id=ditafiles_d203835e22 @format=ditamap @scope=-->
    <!--#82-B due to not @format=dita not keyword-->
    <property name="module.bocian-graph-to-html.example-graph-api-id-12.html"
-             location="/Users/a.binder/procesy5-dita-templates-druki/xmlschema_procesy5/src-xmlschema/public_html/WPS_Functions/bocian-graph-to-html/example-graph-api-id-12.html"/>
+         location="${WPS_Functions.basedir}/bocian-graph-to-html/example-graph-api-id-12.html"/>
 </project>

+ 1 - 1
SE/schema/WPS_Functions/html2image/build_html2image_0.dita.xml

@@ -7,7 +7,7 @@
          xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/"
          xmlns:p5ant="http://biuro.biall-net.pl/xmlschema_procesy5/default_db_xml_cache.public/ant/ant.xsd"
          xmlns:d2a="http://biuro.biall-net.pl/xmlschema_procesy5/WPS_Functions/dita-to-ant/d2a.xsd"
-         basedir="/Users/a.binder/procesy5-dita-templates-druki/xmlschema_procesy5/src-xmlschema/public_html"
+         basedir="../../."
          default="default"
          name="html2image">
    <include file="/Users/a.binder/procesy5-dita-templates-druki/xmlschema_procesy5/src-xmlschema/public_html/WPS_Functions/html2image/build_html2image_0.dita.PRODUCT.xml"