FuzeWorks/Core
FuzeWorks/Core
1
0
Fork 0
Code Issues 9 Pull Requests Packages Releases Activity

Merge branch 'master' into 'master'

Browse Source 
Finalized basic continuous integration

It works! That is quite an achievement

See merge request !19
This commit is contained in:
Abel Hoogeveen 2015-05-03 18:27:06 +02:00
commit 2345c24f4e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/System/class.config.php
View File

@ -41,7 +41,7 @@ class Config extends Bus{
* @return StdObject of config
*/
public function loadConfigFile($name, $directory = null) {
$dir = (isset($directory) ? $directory : "Application/config/");
$dir = (isset($directory) ? $directory : "Application/Config/");
$file = $dir . 'config.' . strtolower($name).".php";
if (file_exists($file)) {

4
build.xml
View File

@ -27,8 +27,8 @@
</target>
<target name="zip">
<exec dir="${basedir}" executable="zip" failonerror="true">
<arg line="-r ${basedir}/build/fuzeworks-core.zip . -x build\* tests\* .git\* phpunit.phar apigen.phar phpunit.xml build.xml" />
<exec dir="${basedir}" executable="git" failonerror="true">
<arg line="archive -o ${basedir}/build/fuzeworks-core.zip HEAD" />
</exec>
</target>