Merge remote-tracking branch 'upstream/master'

Author: tobias-trozowski

.travis.yml

@@ -65,7 +65,7 @@ after_script:
 deploy:
   - provider: releases
     api_key:
-      secure: {ENCRYPTED GITHUB OAUTH TOKEN}
+      secure: DomTGXybcR47TbiNl3I65M9N+qQZLxj22Dqr8W6SQq5/vUoR3BeUprZgYuOhcdWzmjLH0ZLIvn+JMDT8sP4fXkAzpOkeOQY166I6qw3fWXXp9wlh3RZqJghz7R3u+hNn/Md0fgZl1wrO+juNTedd3LVL4b0nKxbcenVFQmRjTEw=
     file: "dist/ZendServerDeploymentHelper-${TRAVIS_TAG}.zpk"
     skip_cleanup: true
     on:

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2013, Zend Technologies USA, Inc.
+Copyright (c) 2005-2017, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -31,6 +31,8 @@ that may be defined in each hook script:
 When implementing deployment packages one quickly notice that some 
 basic functionality like logging or DB import would be helpful.
 
+The ZPK package of the Zend Server Deployment Helper can be found in the release section. The ZPK file can be deployed as a library prior to the app deployment on a Zend Server system.
+
 ## Features
 ### Log
 Enabled logging automatically creates an app-name based log file in 

build.xml

@@ -16,7 +16,6 @@
         <include name="init_autoloader.php"/>
         <include name="LICENSE.txt"/>
         <include name="README.md"/>
-        <include name="etc/**"/>
         <include name="src/**"/>
         <include name="vendor/**"/>
         <exclude name="**/tests/"/>
@@ -43,6 +42,7 @@
         <exclude name="**/.php_cs"/>
         <exclude name="**/Vagrantfile"/>
         <exclude name="**/Doxyfile"/>
+        <exclude name="**/LICENSE.txt"/>
     </fileset>
 
     <target name="init">
@@ -69,6 +69,9 @@
         <!--</fileset>-->
         <!--</copy>-->
 
+        <copy file="${project.root}/LICENSE.txt" tofile="${build.dir}/LICENSE.txt" />
+        <copy file="${project.root}/etc/logo.gif" tofile="${build.dir}/logo.gif" />
+
         <copy todir="${build.dir}/src" tstamp="true">
             <fileset refid="sourcefileset"/>
         </copy>
@@ -91,4 +94,4 @@
 
         <copy file="${dist.dir}/${dist.filename}.zpk" tofile="${dist.dir}/${build.filename.latest}" />
     </target>
-</project>
+</project>

deployment.in.xml

@@ -10,7 +10,7 @@
         <release>%%project.version%%</release>
     </version>
     <releasedate>%%library.releasedate%%</releasedate>
-    <icon>etc/logo.gif</icon>
+    <icon>logo.gif</icon>
     <eula>LICENSE.txt</eula>
     <libdir>src</libdir>
     <scriptsdir>scripts</scriptsdir>