From 9b76842650f8427301050764defa246832aff1c1 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:41:16 -0400 Subject: [PATCH 1/9] Adding library to build system, updating menu, and updating IQC talk information. --- Makefile | 2 +- events.xml | 18 ++++++++++++++---- library/Makefile | 3 +++ menu.xml | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 library/Makefile diff --git a/Makefile b/Makefile index 270f8b3..7de421b 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL = umask 002; exec /bin/sh FILES = events.ics events.atom news.atom index.html stats.html \ favicon.ico default.css csclub.der csclub.pem -SUBDIRS = about events office news services media buttons logos flash +SUBDIRS = about events office news services media buttons logos flash library include common.mk diff --git a/events.xml b/events.xml index 0e0ff2d..cafd3c5 100644 --- a/events.xml +++ b/events.xml @@ -59,16 +59,26 @@ and its guranteed to be dazzling. -

A brief intro to Quantum Computing and why it matters, - followed by a talk on programming quantum computers. + followed by a talk on programming quantum computers. Meet at + the CSC at 4:00PM for a guided walk to the RAC.

-

- TBA

 + +

+ Raymond Laflamme is the director of the Institute for Quantum + Computing at the University of Waterloo and holds the Canada + Research Chair in Quantum Information. He will give a brief + introduction to quantum computing and why it matters, followed + by a talk on programming quantum computers. There will be + tours of the IQC labs at the end, and pizza will be provided + back at the CSC for all attendees. +

+ diff --git a/library/Makefile b/library/Makefile new file mode 100644 index 0000000..1afb1c7 --- /dev/null +++ b/library/Makefile @@ -0,0 +1,3 @@ +FILES = index.cgi +RELDIR = buttons/ +include ../common.mk diff --git a/menu.xml b/menu.xml index c7f476f..f9d1600 100644 --- a/menu.xml +++ b/menu.xml @@ -10,5 +10,5 @@ - + From 798e317b2347ca64adb9352d4c1e8a95e91dea62 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:42:34 -0400 Subject: [PATCH 2/9] Fixing retarded bug in build system. --- library/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Makefile b/library/Makefile index 1afb1c7..ba17b96 100644 --- a/library/Makefile +++ b/library/Makefile @@ -1,3 +1,3 @@ FILES = index.cgi -RELDIR = buttons/ +RELDIR = library/ include ../common.mk From 8c592ec309b60f02526aaf12eb69e1ce92edfa36 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:47:28 -0400 Subject: [PATCH 3/9] I'm retarded. Fixing so we now copy .cgi --- common.mk.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common.mk.in b/common.mk.in index ec3d455..4b2c33b 100644 --- a/common.mk.in +++ b/common.mk.in @@ -37,6 +37,8 @@ $(OUTDIR)%.ics: %.xml $(OUTDIR)%.html: %.html cp -f $< $@ +$(OUTDIR)%.cgi: %.cgi + cp -f $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ $(OUTDIR)%.css: %.css From dcf7e0ed171f1551c0c6e3c79e3015f5074ed0b3 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:48:58 -0400 Subject: [PATCH 4/9] Now preserving permissions. --- common.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index 4b2c33b..5f08162 100644 --- a/common.mk.in +++ b/common.mk.in @@ -38,7 +38,7 @@ $(OUTDIR)%.ics: %.xml $(OUTDIR)%.html: %.html cp -f $< $@ $(OUTDIR)%.cgi: %.cgi - cp -f $< $@ + cp -fp $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ $(OUTDIR)%.css: %.css From baca7f75fb235d6d52e37710b485eba1195e841f Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:50:43 -0400 Subject: [PATCH 5/9] Now htaccess as well. --- common.mk.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index 5f08162..d6d14f5 100644 --- a/common.mk.in +++ b/common.mk.in @@ -38,7 +38,9 @@ $(OUTDIR)%.ics: %.xml $(OUTDIR)%.html: %.html cp -f $< $@ $(OUTDIR)%.cgi: %.cgi - cp -fp $< $@ + cp -f $< $@ +$(OUTDIR)%.htaccess: %.htaccess + cp -f $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ $(OUTDIR)%.css: %.css From 9ea50f9cb94798a1d2b4ff4ea9bd7f04aa0c2ca7 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:51:43 -0400 Subject: [PATCH 6/9] Now we actually include the proper .htaccess file. (Sorry, I'm a retard.) --- library/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Makefile b/library/Makefile index ba17b96..5cbb1cf 100644 --- a/library/Makefile +++ b/library/Makefile @@ -1,3 +1,3 @@ -FILES = index.cgi +FILES = index.cgi .htaccess RELDIR = library/ include ../common.mk From 7a2539318a05e7c93cf4b9dcea8129a35372c86b Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:52:24 -0400 Subject: [PATCH 7/9] Bloody hell. --- common.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index d6d14f5..545321f 100644 --- a/common.mk.in +++ b/common.mk.in @@ -39,7 +39,7 @@ $(OUTDIR)%.html: %.html cp -f $< $@ $(OUTDIR)%.cgi: %.cgi cp -f $< $@ -$(OUTDIR)%.htaccess: %.htaccess +$(OUTDIR)/.htaccess: .htaccess cp -f $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ From 43f53b4f00f0a888f7d9eef62c9f4857b72320bc Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:56:22 -0400 Subject: [PATCH 8/9] Should work now. --- common.mk.in | 2 +- library/Makefile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index 545321f..2c6a299 100644 --- a/common.mk.in +++ b/common.mk.in @@ -39,7 +39,7 @@ $(OUTDIR)%.html: %.html cp -f $< $@ $(OUTDIR)%.cgi: %.cgi cp -f $< $@ -$(OUTDIR)/.htaccess: .htaccess +$(OUTDIR).htaccess: cp -f $< $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ diff --git a/library/Makefile b/library/Makefile index 5cbb1cf..18618b5 100644 --- a/library/Makefile +++ b/library/Makefile @@ -1,3 +1,6 @@ FILES = index.cgi .htaccess RELDIR = library/ include ../common.mk + +.htaccess: .htaccess + cp -f $< $@ \ No newline at end of file From 6c8f0554d112c906e0161531d3a03f4784dc65b1 Mon Sep 17 00:00:00 2001 From: Michael Gregson Date: Tue, 10 Mar 2009 23:56:59 -0400 Subject: [PATCH 9/9] I hate make --- common.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk.in b/common.mk.in index 2c6a299..2fb6e4b 100644 --- a/common.mk.in +++ b/common.mk.in @@ -40,7 +40,7 @@ $(OUTDIR)%.html: %.html $(OUTDIR)%.cgi: %.cgi cp -f $< $@ $(OUTDIR).htaccess: - cp -f $< $@ + cp -f .htaccess $@ $(OUTDIR)%.ico: %.ico cp -f $< $@ $(OUTDIR)%.css: %.css