Преглед на файлове

Some updates to the build system and the introduction

Caleb Fangmeier преди 5 години
родител
ревизия
02961b6cc1
променени са 9 файла, в които са добавени 71 реда и са изтрити 13 реда
  1. 3 3
      Makefile
  2. 11 8
      content/01_introduction.md
  3. 5 0
      content/03_lhc_and_cms_detector.md
  4. 1 1
      content/03_theory.md
  5. 5 0
      content/05_tttt_measurement.md
  6. 18 0
      content/06_pixel_assembly.md
  7. 27 1
      content/summary.md
  8. BIN
      docs/AN2018_062_v15.pdf
  9. 1 0
      pelicanconf.py

+ 3 - 3
Makefile

@@ -73,7 +73,7 @@ pdf:
 
 clean:
 	[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
-	cd $(BUILDDIR); rubber --clean thesis; rm -f *_*.tex; rm -f *_*.html; rm -f *_*.aux
+	cd $(BUILDDIR); git clean -f -X
 
 regenerate:
 	$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
@@ -104,9 +104,9 @@ stopserver:
 	$(BASEDIR)/develop_server.sh stop
 	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
 
-publish:
+publish: html
 	$(PELICAN) $(BUILDDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
-	[ -f content/thesis.pdf ] && cp $(BUILDDIR)/thesis.pdf $(OUTPUTDIR)
+	[ -f $(BUILDDIR)/thesis.pdf ] && cp $(BUILDDIR)/thesis.pdf $(OUTPUTDIR)
 
 ssh_upload: publish
 	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)

Файловите разлики са ограничени, защото са твърде много
+ 11 - 8
content/01_introduction.md


+ 5 - 0
content/03_lhc_and_cms_detector.md

@@ -0,0 +1,5 @@
+---
+title: The LHC and CMS Detector
+...
+
+interesting content

Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
content/03_theory.md


+ 5 - 0
content/05_tttt_measurement.md

@@ -0,0 +1,5 @@
+---
+title: Measurement of the $t\bar{t}t\bar{t}$ Cross Section at 14 TeV
+...
+
+

+ 18 - 0
content/06_pixel_assembly.md

@@ -0,0 +1,18 @@
+---
+title: Phase I Silicon Detector Assembly
+...
+
+
+# Overview
+
+The CMS Phase I Upgrade project was an effort to design and construct an improved detector for Run II of the LHC.
+
+# Automated Assembly
+
+# Gantry Software
+
+# Quality Control
+
+# Results
+
+# Outlook

Файловите разлики са ограничени, защото са твърде много
+ 27 - 1
content/summary.md


BIN
docs/AN2018_062_v15.pdf


+ 1 - 0
pelicanconf.py

@@ -20,6 +20,7 @@ TAG_SAVE_AS = ''
 CATEGORY_SAVE_AS = ''
 AUTHOR_SAVE_AS = ''
 IGNORE_FILES = ['.#*', '*.md', 'chapter.html']
+SLUGIFY_SOURCE = 'basename'
 
 SITEMAP = {'format': 'txt'}
 DEFAULT_DATE = 'fs'  # filesystem date