Permalink
Browse files

Merge branch 'makefile-mung'

  • Loading branch information...
2 parents 22cac54 + b034cf9 commit 793f0ce75e236d89d35cea807933d0bc66d2deca @cbx33 committed Aug 29, 2011
Showing with 236 additions and 271 deletions.
  1. +20 −1 Makefile
  2. +4 −3 html/chap-foot.html
  3. +4 −90 html/chap-head.html
  4. +27 −177 scripts/htmlbuild.py
  5. +181 −0 scripts/munger.py
View
@@ -1,3 +1,7 @@
+# Location of build dir
+BUILD_DIR=build
+
+BUILD_DIR_IMAGES=$(BUILD_DIR)/images/chaps
# Location of website files
SITE_DIR=site
@@ -54,8 +58,17 @@ cleanimages:
cleansite:
@rm -fr $(SITE_DIR)
+cleanbuild:
+ @rm -fr $(BUILD_DIR)
+
site: html htmlimages
+baseconvert: $(BUILD_DIR) $(BUILD_DIR_IMAGES) htmlimages
+ @python scripts/htmlbuild.py alltex
+ @python scripts/htmlbuild.py baseconvert
+ @python scripts/htmlbuild.py baseconcat
+ @cp -r site/images $(BUILD_DIR)
+
# Convert TeX to HTML
html: $(SITE_IMAGES_DIR)
@touch html/nav.html
@@ -110,7 +123,7 @@ htmlimages: $(SITEIMAGES) $(SITE_CHAP_IMAGES_DIR)
@cp images/f-af5-d2.png $(SITE_CHAP_IMAGES_DIR)/f-af5-d2.png
@cp images/f-af5-d3.png $(SITE_CHAP_IMAGES_DIR)/f-af5-d3.png
@cp html/images/* $(SITE_IMAGES_DIR)/
-
+
# Make directories
$(SITE_DIR):
@mkdir -p $(SITE_DIR)
@@ -123,3 +136,9 @@ $(SITE_IMAGES_DIR):
$(SITE_CHAP_IMAGES_DIR):
@mkdir -p $(SITE_CHAP_IMAGES_DIR)
+
+$(BUILD_DIR):
+ @mkdir -p $(BUILD_DIR)
+
+$(BUILD_DIR_IMAGES):
+ @mkdir -p $(BUILD_DIR_IMAGES)
View
@@ -6,12 +6,13 @@
<td class="fade_corner">&nbsp;</td>
</tr>
</table></td>
- </tr>
- </table></td>
+ </tr>
+ </table>
+ </td>
</tr>
<tr>
<td class="foot"><a href="index.html">home</a> | <a href="download.html">download</a> | <a href="read.html">read now</a> | <a href="source.html">source</a> | <a href="feedback.html">feedback</a> | <a href="legal.html">legal stuff</a><br>
- <!--menu provided by <a href="http://apycom.com/">Apycom jQuery Menus</a>--></td>
+ </td>
</tr>
</table></td>
</tr>
View
@@ -5,9 +5,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Git In The Trenches</title>
<link href="stylesheet.css" rel="stylesheet" type="text/css">
-<!-- <link type="text/css" href="menu.css" rel="stylesheet" />-->
-<!-- <script type="text/javascript" src="jquery.js"></script>-->
-<!-- <script type="text/javascript" src="menu.js"></script>-->
+<link type="text/css" href="menu.css" rel="stylesheet" />
+ <script type="text/javascript" src="jquery.js"></script>
</head>
<body>
@@ -22,94 +21,9 @@
<a href="index.html">Home</a>&nbsp;&nbsp;|&nbsp;&nbsp;
<a href="download.html">Download Now</a>&nbsp;&nbsp;|&nbsp;&nbsp;
<a href="intro.html">Read Now</a>&nbsp;&nbsp;|&nbsp;&nbsp;
- <a href="source.html">Source</a>&nbsp;&nbsp;|&nbsp;&nbsp;
+ <a href="http://github.com/cbx33/gitt">Source</a>&nbsp;&nbsp;|&nbsp;&nbsp;
<a href="feedback.html">Feeback</a>
- <!--<div id="menu">
- <ul class="menu">
- <li><a href="index.html" class="parent"><span>Home</span></a>
- </li>
- <li><a href="download.html"><span>Download Now</span></a></li>
- <li><a href="read.html"><span>Read Now</span></a><div><ul>
- <li><a href="#" class="parent"><span>Chapter 1</span></a>
- <div><ul>
- <li><a href="#"><span>Day 1</span></a></li>
- <li><a href="#"><span>Day 2</span></a></li>
- <li><a href="#"><span>Day 3</span></a></li>
- <li><a href="#"><span>Day 4</span></a></li>
- <li><a href="#"><span>Day 5</span></a></li>
- <li><a href="#"><span>Day 6</span></a></li>
- </ul></div>
- </li>
- <li><a href="#" class="parent"><span>Chapter 2</span></a>
- <div><ul>
- <li><a href="#"><span>Day 1</span></a></li>
- <li><a href="#"><span>Day 2</span></a></li>
- <li><a href="#"><span>Day 3</span></a></li>
- <li><a href="#"><span>Day 4</span></a></li>
- <li><a href="#"><span>Day 5</span></a></li>
- <li><a href="#"><span>Day 6</span></a></li>
- </ul></div></li>
- <li><a href="#" class="parent"><span>Chapter 3</span></a>
- <div><ul>
- <li><a href="#"><span>Day 1</span></a></li>
- <li><a href="#"><span>Day 2</span></a></li>
- <li><a href="#"><span>Day 3</span></a></li>
- <li><a href="#"><span>Day 4</span></a></li>
- <li><a href="#"><span>Day 5</span></a></li>
- <li><a href="#"><span>Day 6</span></a></li>
- </ul></div></li>
- <li><a href="#" class="parent"><span>Chapter 4</span></a>
- <div><ul>
- <li><a href="#"><span>Day 1</span></a></li>
- <li><a href="#"><span>Day 2</span></a></li>
- <li><a href="#"><span>Day 3</span></a></li>
- <li><a href="#"><span>Day 4</span></a></li>
- <li><a href="#"><span>Day 5</span></a></li>
- <li><a href="#"><span>Day 6</span></a></li>
- </ul></div></li>
- <li><a href="#" class="parent"><span>Chapter 5</span></a>
- <div><ul>
- <li><a href="#"><span>Day 1</span></a></li>
- <li><a href="#"><span>Day 2</span></a></li>
- <li><a href="#"><span>Day 3</span></a></li>
- <li><a href="#"><span>Day 4</span></a></li>
- <li><a href="#"><span>Day 5</span></a></li>
- <li><a href="#"><span>Day 6</span></a></li>
- </ul></div></li>
- <li><a href="#" class="parent"><span>Chapter 6</span></a>
- <div><ul>
- <li><a href="#"><span>Day 1</span></a></li>
- <li><a href="#"><span>Day 2</span></a></li>
- <li><a href="#"><span>Day 3</span></a></li>
- <li><a href="#"><span>Day 4</span></a></li>
- <li><a href="#"><span>Day 5</span></a></li>
- <li><a href="#"><span>Day 6</span></a></li>
- </ul></div></li>
- <li><a href="#" class="parent"><span>Chapter 7</span></a>
- <div><ul>
- <li><a href="#"><span>Day 1</span></a></li>
- <li><a href="#"><span>Day 2</span></a></li>
- <li><a href="#"><span>Day 3</span></a></li>
- <li><a href="#"><span>Day 4</span></a></li>
- <li><a href="#"><span>Day 5</span></a></li>
- <li><a href="#"><span>Day 6</span></a></li>
- </ul></div></li>
- <li><a href="#" class="parent"><span>Chapter 8</span></a>
- <div><ul>
- <li><a href="#"><span>Day 1</span></a></li>
- <li><a href="#"><span>Day 2</span></a></li>
- <li><a href="#"><span>Day 3</span></a></li>
- <li><a href="#"><span>Day 4</span></a></li>
- <li><a href="#"><span>Day 5</span></a></li>
- <li><a href="#"><span>Day 6</span></a></li>
- </ul></div></li>
- </ul></div>
- </li>
- <li><a href="source.html"><span>Source</span></a></li>
- <li class="last"><a href="feedback.html"><span>Feedback</span></a></li>
- </ul>
- </div>-->
- </td>
+ </td>
</tr>
</table></td>
</tr>
Oops, something went wrong.

0 comments on commit 793f0ce

Please sign in to comment.