commit b9da0db5e54f23411516bbc61d1ed10b4507ee62
parent 9314839d5c95f01fc986874119877fa2da77ed61
Author: Felicitus <felicitus@felicitus.org>
Date: Fri, 16 Dec 2011 02:40:02 +0100
Moved directories to src/
Diffstat:
9 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -1,14 +1,14 @@
[submodule "frontend/resources/silkicons"]
- path = frontend/resources/silkicons
+ path = src/frontend/resources/silkicons
url = git://github.com/partkeepr/famfamfam_silkicons.git
[submodule "frontend/resources/flags"]
- path = frontend/resources/flags
+ path = src/frontend/resources/flags
url = git://github.com/partkeepr/famfamfam_flags.git
[submodule "frontend/resources/mimetypes"]
- path = frontend/resources/mimetypes
+ path = src/frontend/resources/mimetypes
url = git://github.com/partkeepr/splitbrain_mimetypes.git
[submodule "frontend/resources/fugue-icons"]
- path = frontend/resources/fugue-icons
+ path = src/frontend/resources/fugue-icons
url = git://github.com/yusukekamiyamane/fugue-icons.git
[submodule "3rdparty/extjs"]
diff --git a/build.xml b/build.xml
@@ -4,7 +4,7 @@
<target name="pre-commit">
<jsllint haltonfailure="true">
- <fileset dir="frontend">
+ <fileset dir="src/frontend">
<include name="**/*.js"/>
</fileset>
</jsllint>
@@ -13,7 +13,7 @@
<!-- Cleans the output directories -->
<target name="clean">
<delete dir="reports" />
- <delete dir="build" />
+ <delete dir="frontend" />
<delete dir="data" />
</target>
@@ -37,9 +37,9 @@
</target>
<target name="build-setup">
- <mkdir dir="build-setup/"/>
+ <mkdir dir="setup/"/>
- <copy overwrite="false" todir="build-setup/extjs/">
+ <copy overwrite="false" todir="setup/extjs/">
<fileset dir="${extjs.path}">
<include name="bootstrap.js"/>
<include name="compatibility/ext3-core-compat.js"/>
@@ -53,7 +53,7 @@
</fileset>
</copy>
- <copy overwrite="true" todir="build-setup/">
+ <copy overwrite="true" todir="setup/">
<fileset dir="setup">
<include name="**"/>
</fileset>
@@ -63,8 +63,8 @@
<target name="build-frontend">
<echo>Copying 3rdparty/extjs - this may take up to a few minutes</echo>
- <mkdir dir="build/"/>
- <copy overwrite="false" todir="build/extjs/">
+ <mkdir dir="frontend/"/>
+ <copy overwrite="false" todir="frontend/extjs/">
<fileset dir="${extjs.path}">
<include name="bootstrap.js"/>
<include name="compatibility/ext3-core-compat.js"/>
@@ -80,30 +80,30 @@
</copy>
<echo>Copying Ext Statusbar</echo>
- <copy overwrite="false" todir="build/js/Ext.ux/">
+ <copy overwrite="false" todir="frontend/js/Ext.ux/">
<fileset dir="${extjs.path}/examples/ux">
<include name="statusbar/**"/>
</fileset>
</copy>
<echo>Copying Ext.tab.TabCloseMenu</echo>
- <copy overwrite="false" todir="build/js/Ext.ux/">
+ <copy overwrite="false" todir="frontend/js/Ext.ux/">
<fileset dir="${extjs.path}/examples/ux">
<include name="TabCloseMenu.js"/>
</fileset>
</copy>
<echo>Copying phpjs</echo>
- <mkdir dir="build/js/org.phpjs.lib/"/>
- <copy overwrite="false" todir="build/js/org.phpjs.lib">
+ <mkdir dir="frontend/js/org.phpjs.lib/"/>
+ <copy overwrite="false" todir="frontend/js/org.phpjs.lib">
<fileset dir="3rdparty/phpjs/">
<include name="php.default.min.js"/>
</fileset>
</copy>
<echo>Copying JS frontend</echo>
- <copy overwrite="true" todir="build/">
- <fileset dir="frontend">
+ <copy overwrite="true" todir="frontend/">
+ <fileset dir="src/frontend">
<include name="**"/>
</fileset>
</copy>
@@ -129,14 +129,14 @@
<!-- Builds the jsb3 file and build the minified JS files -->
<target name="jsbuilder">
- <exec command="php util/gen-jsb3-file.php ./frontend/ ${extjs.path}"/>
- <exec command="${extjs.path}/jsbuilder/JSBuilder.sh --projectFile ${project.basedir}/partkeepr.jsb3 --deployDir ${project.basedir}/build/js" passthru="true"/>
+ <exec command="php util/gen-jsb3-file.php ./src/frontend/ ${extjs.path}"/>
+ <exec command="${extjs.path}/jsbuilder/JSBuilder.sh --projectFile ${project.basedir}/partkeepr.jsb3 --deployDir ${project.basedir}/frontend/js" passthru="true"/>
</target>
<!-- Checks all JavaScript files for common mistakes. Requires JSLint from http://www.javascriptlint.com -->
<target name="jslint">
<jsllint>
- <fileset dir="frontend">
+ <fileset dir="src/frontend">
<include name="**/*.js"/>
</fileset>
</jsllint>
diff --git a/frontend/resources/flags b/frontend/resources/flags
@@ -1 +0,0 @@
-Subproject commit 0fe60f3b8fc21253934b714846bf9277cb053486
diff --git a/frontend/resources/fugue-icons b/frontend/resources/fugue-icons
@@ -1 +0,0 @@
-Subproject commit f227de68bed077d614816a357b239b8ac9080b64
diff --git a/frontend/resources/mimetypes b/frontend/resources/mimetypes
@@ -1 +0,0 @@
-Subproject commit cbcbc29105f8b90cb1f7e942cbfc22cc77da2c3c
diff --git a/frontend/resources/silkicons b/frontend/resources/silkicons
@@ -1 +0,0 @@
-Subproject commit b028e5bfb66c838cc0992781b6b5375be9aceac6
diff --git a/setup/check.php b/src/setup/check.php
diff --git a/setup/index.html b/src/setup/index.html
diff --git a/setup/js/PartKeeprSetup.js b/src/setup/js/PartKeeprSetup.js
