浏览代码

upd error chown

a.binder 8 年之前
父节点
当前提交
a410298138
共有 2 个文件被更改,包括 8 次插入7 次删除
  1. 7 6
      SE/build_SE.xml
  2. 1 1
      SE/schema/build.p5build.GLOBALS.xml

+ 7 - 6
SE/build_SE.xml

@@ -10,6 +10,7 @@
     <!-- @2018 property correct structure -->
     <include file="${basedir}/build_SE_basedir/build.p5build_SE.PRODUCT.xml"/>
     <include file="${basedir}/build_SE_basedir/build.p5build_SE.SYSTEM.xml" as="SYSTEM"/>
+    <include file="${basedir}/build.p5build.GLOBALS.xml"/>
     <!--<property name="p5build_SE.PRODUCT.name" value="p5build_SE"/>
         <property name="p5build_SE.PRODUCT.vendor-domain" value="pl.procesy5"/>
         <property name="p5build_SE.PRODUCT.name.PROCESY5.basedir" value="${basedir}/build_SE_basedir"/>
@@ -226,16 +227,16 @@
         <echoproperties destfile="${p5build_SE.properties.xml}" format="xml"/>
             <chmod file="${p5build_SE.properties}" perm="777" failonerror="false"/>
             <chmod file="${p5build_SE.properties.xml}" perm="777"/>
-        <chown file="${p5build_SE.properties}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
-        <chown file="${p5build_SE.properties.xml}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
+        <chown executable="${chown}" file="${p5build_SE.properties}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
+        <chown executable="${chown}" file="${p5build_SE.properties.xml}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
     </target>
     
     <target name="build_SE.install_dirs">
         <echo level="verbose">#232 will make dir="${p5build_SE.basedir}"  dir="${p5build_SE.temp}" and  owner="${p5build_SE.SYSTEM.local-user}" </echo>
         <mkdir dir="${p5build_SE.basedir}"/>
         <mkdir dir="${p5build_SE.temp}"/>
-        <chown file="${p5build_SE.basedir}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false" />
-        <chown file="${p5build_SE.temp}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
+        <chown executable="${chown}" file="${p5build_SE.basedir}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false" />
+        <chown executable="${chown}" file="${p5build_SE.temp}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
     </target>
     
     
@@ -262,7 +263,7 @@
                 <procesy5_config.folders.server>${procesy5_config.folders.server_loadfile}</procesy5_config.folders.server>
             </procesy5_config>
         </echoxml>
-        <chown file="${procesy5_config.folders_loadfile_xml}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
+        <chown executable="${chown}" file="${procesy5_config.folders_loadfile_xml}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
         <xslt basedir="./" style="${procesy5_config.folders.xsl}" in="${procesy5_config.folders_loadfile_xml}"  destdir="./" out="${procesy5_config.folders.properties.xml}" force="yes">
             <factory name="net.sf.saxon.TransformerFactoryImpl">    
                 <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
@@ -272,7 +273,7 @@
             <!--<param name="main_build_recurse_ant.dita" expression="${main_build_recurse_ant.dita}"/>-->
             <!--<param name="basedir" expression="${basedir}"/>-->
         </xslt>
-        <chown file="${procesy5_config.folders.properties.xml}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
+        <chown executable="${chown}" file="${procesy5_config.folders.properties.xml}" owner="${p5build_SE.SYSTEM.local-user}" failonerror="false" failifexecutionfails="false"/>
         <loadfile property="procesy5_config.folders.properties.xml.file" srcfile="${procesy5_config.folders.properties.xml}"/>
         <!--<echo>#60 reading $procesy5_config.folders.properties.xml ${procesy5_config.folders.properties.xml.file}
             ${procesy5_config.folders.properties.xml.file}

+ 1 - 1
SE/schema/build.p5build.GLOBALS.xml

@@ -8,5 +8,5 @@
     <property name="mysql" value="mysql"/>
     <property name="mysqldump" value="mysqldump"/>
     <property name="PATH_ADD" value="/opt/local/bin:/usr/bin:/bin"/> <!-- to use in mapserver_gml_to_png ant kw -->
-    
+    <property name="chown" location="/usr/sbin/chown"/>
 </project>