summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Wall <richard@aziz>2010-08-22 14:32:08 +0100
committerRichard Wall <richard@aziz>2010-08-22 14:32:08 +0100
commit8e973280259e070c287503d5636fe7d2e61d2f98 (patch)
tree6abb59b9175e17ec58f301d99426c682cbae6d9a
parenta8dda6336615028fc08e0833700cded8cd2544dc (diff)
move jarmon.js into a subfolder so that we can point yuidoc at only that file
-rw-r--r--index.html2
-rw-r--r--jarmon/jarmon.js (renamed from jarmon.js)0
-rw-r--r--jarmonbuild/commands.py2
3 files changed, 2 insertions, 2 deletions
diff --git a/index.html b/index.html
index cdc920e..7f3c623 100644
--- a/index.html
+++ b/index.html
@@ -13,7 +13,7 @@
<script type="text/javascript" src="assets/js/dependencies.js"></script>
- <script type="text/javascript" src="jarmon.js"></script>
+ <script type="text/javascript" src="jarmon/jarmon.js"></script>
<script type="text/javascript" src="docs/jarmon_example_recipes.js"></script>
<script type="text/javascript">
// Recipes for the charts on this page
diff --git a/jarmon.js b/jarmon/jarmon.js
index 44c4dad..44c4dad 100644
--- a/jarmon.js
+++ b/jarmon/jarmon.js
diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py
index 2e38382..addfcd5 100644
--- a/jarmonbuild/commands.py
+++ b/jarmonbuild/commands.py
@@ -107,7 +107,7 @@ class BuildApidocsCommand(BuildCommand):
check_call((
sys.executable,
os.path.join(yuidoc_dir, 'bin', 'yuidoc.py'),
- workingbranch_dir,
+ os.path.join(workingbranch_dir, 'jarmon'),
'--parseroutdir=%s' % (
os.path.join(build_dir, 'docs', 'apidocs'),),
'--outputdir=%s' % (