Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Port website toolchain to new git layout

[ ] May break build
[ ] May break existing applications (see CHANGES.txt)
[ ] Bugfix
[ ] New Feature
[x] Cleanup
[ ] Optimization
[ ] Documentation
  • Loading branch information...
commit 8076189d72c6b171bad7b75b7f3bad5790b00069 1 parent d2e01ad
Stefan Eilemann authored March 28, 2011
46  Makefile
... ...
@@ -1,4 +1,4 @@
1  
-.PHONY: update svnupdate gitupdate doxygen update_and_targets
  1
+.PHONY: update srcupdate doxygen update_and_targets
2 2
 .SUFFIXES: .html .css
3 3
 
4 4
 TARGET = build
@@ -8,7 +8,6 @@ FILES = \
8 8
 	stylesheet.css \
9 9
 	api.html \
10 10
 	applications.html \
11  
-	changes.html \
12 11
 	compatibility.html \
13 12
 	configuration.html \
14 13
 	contributions.html \
@@ -205,12 +204,11 @@ IMAGES   = $(IMAGES_SRC) \
205 204
 PAGES    = $(HTML_SRC:%.shtml=%.html)
206 205
 SITEMAP  = $(TARGET)/sitemap.xml.gz
207 206
 
208  
-SVN ?= svn
209 207
 GIT ?= git
210 208
 MD2HTML ?= markdown-2.6 -x toc -x fenced_code
211 209
 CPP_HTML = gcc -xc -ansi -E -C -Iinclude \
212  
-           -DUPDATE="`$(SVN) info $< | grep 'Last Changed Date' | sed 's/.*, \(.*\))/\1/'`" \
213  
-           -DCHANGEURL=\"http://equalizer.svn.sourceforge.net/viewvc/equalizer/trunk/website/$<?view=log\" \
  210
+           -DUPDATE="`$(GIT) log -1 $< | grep 'Date:' | sed 's/Date:   //'`" \
  211
+           -DCHANGEURL=\"https://github.com/Eyescale/equalizergraphics.com/commits/master/$<\" \
214 212
            -DFULLURL=$(@:$(TARGET)%=http://www.equalizergraphics.com%) \
215 213
            -DPAGEURL=$(@:$(TARGET)%=%) \
216 214
            -DWIKIURL=$(<:documents/design/%.shtml=http://github.com/Eyescale/Equalizer/wiki/%)
@@ -223,18 +221,18 @@ clean:
223 221
 	rm -rf $(TARGETS)
224 222
 
225 223
 install: $(SITEMAP) package
226  
-	rsync -avz --exclude=".svn" --exclude "*.docset" -e ssh $(TARGET)/ 80.74.159.177:var/www/www.equalizergraphics.com
227  
-	rsync -avz --exclude=".svn" --exclude "*.docset" -e ssh ../src/docs/Equalizer*.dmg 80.74.159.177:var/www/www.equalizergraphics.com/downloads/nightly/
  224
+	rsync -avz --exclude=".git" --exclude "*.docset" -e ssh $(TARGET)/ 80.74.159.177:var/www/www.equalizergraphics.com
  225
+	rsync -avz --exclude=".git" --exclude "*.docset" -e ssh ../src/docs/Equalizer*.dmg 80.74.159.177:var/www/www.equalizergraphics.com/downloads/nightly/
228 226
 
229 227
 install_web: $(SITEMAP)
230  
-	rsync -avz --exclude=".svn" --exclude "*.docset" -e ssh $(TARGET)/ 80.74.159.177:var/www/www.equalizergraphics.com
  228
+	rsync -avz --exclude=".git" --exclude "*.docset" -e ssh $(TARGET)/ 80.74.159.177:var/www/www.equalizergraphics.com
231 229
 
232 230
 install_only: all
233  
-	rsync -avz --exclude=".svn" --exclude "*.docset" -e ssh $(TARGET)/ 80.74.159.177:var/www/www.equalizergraphics.com
234  
-	rsync -avz --exclude=".svn" --exclude "*.docset" -e ssh ../src/docs/Equalizer*.dmg 80.74.159.177:var/www/www.equalizergraphics.com/downloads/nightly/
  231
+	rsync -avz --exclude=".git" --exclude "*.docset" -e ssh $(TARGET)/ 80.74.159.177:var/www/www.equalizergraphics.com
  232
+	rsync -avz --exclude=".git" --exclude "*.docset" -e ssh ../src/docs/Equalizer*.dmg 80.74.159.177:var/www/www.equalizergraphics.com/downloads/nightly/
235 233
 
236 234
 auxinst: all
237  
-	rsync -avz --exclude=".svn" --exclude "*.docset" --exclude "*.html" -e ssh $(TARGET)/ 80.74.159.177:var/www/www.equalizergraphics.com
  235
+	rsync -avz --exclude=".git" --exclude "*.docset" --exclude "*.html" -e ssh $(TARGET)/ 80.74.159.177:var/www/www.equalizergraphics.com
238 236
 
239 237
 $(SITEMAP): update_and_targets doxygen
240 238
 	@sitemap_gen --config=sitemap_config.xml
@@ -242,13 +240,13 @@ $(SITEMAP): update_and_targets doxygen
242 240
 update_and_targets: update
243 241
 	 @$(MAKE) all
244 242
 
245  
-update: svnupdate gitupdate nightlyupdate
  243
+update: srcupdate nightlyupdate
246 244
 	rm -f changes_log.html
247 245
 
248  
-svnupdate:
249  
-	$(SVN) update ..
250  
-
251  
-gitupdate:
  246
+srcupdate:
  247
+	-$(GIT) pull
  248
+	-cd ../Equalizer; $(GIT) pull
  249
+	-cd ../EqDocs; $(GIT) pull
252 250
 	-cd Equalizer.wiki; $(GIT) pull
253 251
 
254 252
 nightlyupdate:
@@ -284,19 +282,19 @@ $(TARGET)/documents/WhitePapers/%.pdf: documents/WhitePapers/%/paper.pdf
284 282
 	@mkdir -p $(@D)
285 283
 	cp $< $@
286 284
 
287  
-$(TARGET)/documents/Developer/%.pdf: ../doc/Developer/%/paper.pdf
  285
+$(TARGET)/documents/Developer/%.pdf: ../EqDocs/Developer/%/paper.pdf
288 286
 	@mkdir -p $(@D)
289 287
 	cp $< $@
290 288
 
291  
-$(TARGET)/documents/Developer/eqPlyPresentation.pdf: ../doc/Developer/eqPly/presentation/eqPly.pdf
  289
+$(TARGET)/documents/Developer/eqPlyPresentation.pdf: ../EqDocs/Developer/eqPly/presentation/eqPly.pdf
292 290
 	@mkdir -p $(@D)
293 291
 	cp $< $@
294 292
 
295  
-$(TARGET)/documents/Developer/eqPly.pdf: ../doc/Developer/eqPly/Semesterarbeit.pdf
  293
+$(TARGET)/documents/Developer/eqPly.pdf: ../EqDocs/Developer/eqPly/Semesterarbeit.pdf
296 294
 	@mkdir -p $(@D)
297 295
 	cp $< $@
298 296
 
299  
-$(TARGET)/downloads/DBCAAF49A0C0/ProgrammingUserGuide.pdf: ../doc/Developer/ProgrammingGuide/paper.pdf
  297
+$(TARGET)/downloads/DBCAAF49A0C0/ProgrammingUserGuide.pdf: ../EqDocs/Developer/ProgrammingGuide/paper.pdf
300 298
 	@mkdir -p $(@D)
301 299
 	cp $< $@
302 300
 
@@ -323,11 +321,3 @@ $(TARGET)/%-small.jpg: %.png
323 321
 $(TARGET)/% : %
324 322
 	@mkdir -p $(@D)
325 323
 	cp -rf $< $(@D)
326  
-
327  
-$(TARGET)/changes.html: changes.shtml changes_log.html
328  
-
329  
-equalizer.rdf:
330  
-	./changes.pl > $@
331  
-
332  
-changes_log.html:
333  
-	./changes.pl > $@
149  changes.pl
... ...
@@ -1,149 +0,0 @@
1  
-#!/opt/local/bin/perl -w
2  
-# Creates an html page and RSS feed for latest changes on the website.
3  
-
4  
-# needs perl modules: 'sudo port install p5-xml-rss p5-datetime'
5  
-
6  
-use strict;
7  
-use XML::RSS;
8  
-
9  
-my $svn = $ENV{'SVN'};
10  
-if( !$svn || $svn eq "" )
11  
-{
12  
-    $svn = "svn";
13  
-}
14  
-
15  
-my @changes = `$svn log --limit 15 -v`;
16  
-my $state   = "initial";
17  
-my $rev;
18  
-my $date;
19  
-my $time;
20  
-my $image = "";
21  
-my @files;
22  
-
23  
-# RSS setup
24  
-my $rss = new XML::RSS( version => '1.0' );
25  
-$rss->channel(
26  
-    title        => "Latest Changes on Equalizer: Parallel Rendering",
27  
-    link         => "http://www.equalizergraphics.com",
28  
-    description  => "Parallel Rendering Software for OpenGL",
29  
-    dc => {
30  
-        date       => `date +%Y-%m-%dT%H:%M+01:00`,
31  
-        subject    => "Parallel Rendering",
32  
-        creator    => 'eile@equalizergraphics.com',
33  
-        publisher  => 'webmaster@equalizergraphics',
34  
-        rights     => 'Copyright 2008, Stefan Eilemann',
35  
-        language   => 'en-us',
36  
-    },
37  
-    syn => {
38  
-        updatePeriod     => "daily",
39  
-        updateFrequency  => "1",
40  
-        updateBase       => "2000-01-01T10:00+00:00",
41  
-    }
42  
-);
43  
-
44  
-# go through last changes
45  
-foreach ( @changes )
46  
-{
47  
-    if( $state eq "initial" && /^\-+$/ )
48  
-    {
49  
-        $state = "revision";
50  
-    }
51  
-    elsif( $state eq "revision" )
52  
-    {
53  
-        chomp();
54  
-        my @words = split /\s+/;
55  
-        $rev  = $words[0];
56  
-        $date = $words[4];
57  
-        $time = $words[5];
58  
-        $rev =~ s/r(\d+)\s*/$1/;
59  
-        $state = "paths";
60  
-    }
61  
-    elsif( $state eq "paths" )
62  
-    {
63  
-        $state = "files";
64  
-    }
65  
-    elsif( $state eq "files" )
66  
-    {
67  
-        if( /^$/ )
68  
-        {
69  
-            $state = "excerpt";
70  
-        }
71  
-        elsif( / +([A-Z]) \/trunk\/website(\/[\w\/\._\-]+(html|shtml|png|jpg|pdf))([ \n])/ )
72  
-        {
73  
-            my $op   = $1;
74  
-            my $file = $2;
75  
-            my $type = $3;
76  
-
77  
-            $file =~ s/\.shtml/.html/;
78  
-
79  
-            if( !($file =~ /include/) && !($file =~ /DBCAAF49A0C0/) && $op ne "D" )
80  
-            {
81  
-                push( @files, $file );
82  
-
83  
-                if( $image eq "" && $type =~ /(png|jpg)/ && -e "build/$file" )
84  
-                {
85  
-                    $image = $file;
86  
-                }
87  
-            }
88  
-        }
89  
-    }
90  
-    elsif( $state eq "excerpt" )
91  
-    {
92  
-        chomp();
93  
-        s/Website://;
94  
-        s/^\s*//;
95  
-        s/[\<\>]//g;
96  
-
97  
-        my $excerpt = $_;
98  
-        print "    <li><a name=\"$rev\"></a>$date: <a href=\"http://equalizer.svn.sourceforge.net/viewvc/equalizer?view=rev&revision=$rev\">$excerpt</a></li>\n";
99  
-        my $description = "";
100  
-
101  
-        if( @files )
102  
-        {
103  
-            if( $image ne "" )
104  
-            {
105  
-                $description .= "    <div class=\"float_right\">\n";
106  
-                $description .= "        <img src=\"http://www.equalizergraphics.com$image\" width=\"200\">\n";
107  
-                $description .= "    </div>\n";
108  
-            }
109  
-
110  
-            $description .= "    <ul><font size=\"-1\">\n";
111  
-            foreach my $file ( @files )
112  
-            {
113  
-                if(  -e "build/$file" )
114  
-                {
115  
-                    $description .="        <li><a href=\"http://www.equalizergraphics.com$file\">$file</a></li>\n";
116  
-                }
117  
-                else
118  
-                {
119  
-                    $description .="        <li>$file</li>\n";
120  
-                }
121  
-            }
122  
-            $description .= "    </font></ul>\n";
123  
-        }
124  
-        print $description;
125  
-        if( $image ne "" )
126  
-        {
127  
-            print "<div class=\"flush_float\"></div>\n";
128  
-        }
129  
-
130  
-        $rss->add_item(
131  
-            title       => "$excerpt",
132  
-            link        => "http://www.equalizergraphics.com/changes.html#$rev",
133  
-            description => $description,
134  
-            dc          => {
135  
-                date        => $date . "T" . $time . "+01:00",
136  
-            }
137  
-            );
138  
-
139  
-        $rev  = "";
140  
-        $date = "";
141  
-        $time = "";
142  
-        $image = "";
143  
-        $state = "initial";
144  
-        @files = ();
145  
-    }
146  
-
147  
-    # save RSS feed
148  
-    $rss->save( "equalizer.rdf" );
149  
-}
13  changes.shtml
... ...
@@ -1,13 +0,0 @@
1  
-#define S_CHANGES
2  
-#define PAGE Latest Changes
3  
-
4  
-#include "header.shtml"
5  
-
6  
-<p>
7  
-  <ul>
8  
-#    include "changes_log.html"
9  
-  </ul>
10  
-</p>
11  
-
12  
-#include "footer.shtml"
13  
-<!-- $Id: index.shtml 1137 2007-05-28 12:48:18Z eile $ -->
4  include/header.shtml
@@ -69,8 +69,8 @@
69 69
       <!-- What is new? -->
70 70
       <div class="subnavigation"><center>
71 71
           <b>What is new?</b><br>
72  
-          <a href="/changes.html">Latest Website Changes</a><br>
73  
-          <a href="http://www.equalizergraphics.com/cgi-bin/viewvc.cgi/trunk/src/?view=log">Latest
  72
+          <a href="https://github.com/Eyescale/equalizergraphics.com/commits/master/">Latest Website Changes</a><br>
  73
+          <a href="https://github.com/Eyescale/Equalizer/commits/master/">Latest
74 74
             Source Code Changes</a><br>
75 75
           <a href="http://pogl.wordpress.com/">Developer Blog</a><br>
76 76
           <b>New:</b><a href="http://twitter.com/EqualizerTricks">Tips &amp; Tricks on Twitter</a>

0 notes on commit 8076189

Please sign in to comment.
Something went wrong with that request. Please try again.