Merge branch 'master' into 'master'
Finalized basic continuous integration It works! That is quite an achievement See merge request !19
This commit is contained in:
commit
2345c24f4e
|
@ -41,7 +41,7 @@ class Config extends Bus{
|
||||||
* @return StdObject of config
|
* @return StdObject of config
|
||||||
*/
|
*/
|
||||||
public function loadConfigFile($name, $directory = null) {
|
public function loadConfigFile($name, $directory = null) {
|
||||||
$dir = (isset($directory) ? $directory : "Application/config/");
|
$dir = (isset($directory) ? $directory : "Application/Config/");
|
||||||
$file = $dir . 'config.' . strtolower($name).".php";
|
$file = $dir . 'config.' . strtolower($name).".php";
|
||||||
|
|
||||||
if (file_exists($file)) {
|
if (file_exists($file)) {
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="zip">
|
<target name="zip">
|
||||||
<exec dir="${basedir}" executable="zip" failonerror="true">
|
<exec dir="${basedir}" executable="git" failonerror="true">
|
||||||
<arg line="-r ${basedir}/build/fuzeworks-core.zip . -x build\* tests\* .git\* phpunit.phar apigen.phar phpunit.xml build.xml" />
|
<arg line="archive -o ${basedir}/build/fuzeworks-core.zip HEAD" />
|
||||||
</exec>
|
</exec>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user