a.binder 9 лет назад
Родитель
Сommit
813c6ef7c9

+ 2 - 1
SE/schema/ant-url_action/default_db.in7_dziennik_koresp/test-druk/build.xml

@@ -428,6 +428,7 @@
         <echo message="OUTPUT__START"/>   
         <echo>&lt;br&gt;Skasowano pliki tymczasowe&lt;/br&gt;</echo>         
         <echo message="OUTPUT__END"/>
+        <antcall target="install_folders"/>
     </target>
     
     
@@ -618,7 +619,7 @@
 
 
 
-    <target name="buildpdf_recursed" depends="uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,check_dita" if="${test_if_dita}">
+    <target name="buildpdf_recursed" depends="install_folders,uuid_check,typeName_check,xpath_check,xpath_value_check,passwordBase64Basic_check,php_session_id_check,check_dita" if="${test_if_dita}">
         <property name="dita.dir" location="/Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3/bin/dita"/>
         <exec executable="${dita.dir}" dir=".">
             <arg value="-i"/>

+ 2 - 1
SE/schema/default_db_xml_cache.public/build_recurse_ant_merge_dita_from_temp.xsl

@@ -17,7 +17,8 @@
     <!--<xsl:param name="basedir" required="yes"/>-->
     <xsl:param name="temp" required="yes"/>
     <xsl:param name="with_RelatedFeatureLoop" select="false()"/>
-    <xsl:param name="simpleSchema_dir" required="yes"/> <!-- ..../default_db.instance.xml/simpleSchema/ -->
+    <xsl:param name="simpleSchema_dir" required="yes"/>
+
     <!-- template do zlaczenia wszystkich xmli z danymi z dita 
     description="z plikow temp/$uuid.* buduje $out_task.dita " -->
     

+ 6 - 5
SE/schema/default_db_xml_cache.public/builds_to_ant.xsl

@@ -74,16 +74,17 @@
                             #
                             #
                         </echo>
-                        <parallel threadCount="4" failonany="true"> <!-- threadCount="4"  -->
+                        <parallel  failonany="true"> <!-- threadCount="4"  -->
                             <xsl:for-each select="tokenize(.,';')">
                                 <java>
                                     <xsl:attribute name="classname" select="'org.apache.tools.ant.Main'"/>
                                     <!--<xsl:attribute name="dir" select="'${basedir}'"/>-->
-                                    <xsl:attribute name="dir" select="'${basedir}'"/>
-                                    <xsl:attribute name="fork" select="'false'"/>
-                                    <xsl:attribute name="clonevm" select="'true'"/>
+                                    <!--<xsl:attribute name="dir" select="'${basedir}'"/>-->
+                                    <!--<xsl:attribute name="fork" select="'false'"/>-->
+                                    <xsl:attribute name="clonevm" select="'false'"/>
                                     <xsl:attribute name="failonerror" select="'true'"/>
-                                    <xsl:attribute name="resultproperty" select="concat(.,'_resprop')"/>
+                                    <xsl:attribute name="append" select="'true'"/>
+                                    <!--<xsl:attribute name="resultproperty" select="concat(.,'_resprop')"/>-->
                                     <!--<xsl:attribute name="output" select="concat(.,'_out.log')"/>-->
                                     <arg value="-buildfile"/>
                                     <arg value="{$temp}/{.}"/>