Skip to content

Commit

Permalink
Make web pages work in out-of-tree builds
Browse files Browse the repository at this point in the history 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
David Woodhouse authored and David Woodhouse committed Feb 11, 2014
1 parent b098d5b commit 6654807
Show file tree
Hide file tree
Showing 20 changed files with 19 additions and 29 deletions.
1 change: 0 additions & 1 deletion www/building.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/changelog.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/connecting.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/contribute.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/csd.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/download.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace="" />
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/features.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/gui.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
6 changes: 6 additions & 0 deletions www/html.py
View file
Expand Up @@ -233,6 +233,12 @@ def parseConfig(file):
pass
pass

# Handle special case VAR_ORIGIN
idx = len(replace)
replace[idx:] = ['VAR_ORIGIN']
idx = len(replace)
replace[idx:] = [lookupdir]

if not arguments:
print "No source file specified"
usage()
Expand Down
1 change: 0 additions & 1 deletion www/index.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/mail.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/manual.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
12 changes: 6 additions & 6 deletions www/menu1.xml
View file
@@ -1,11 +1,11 @@
<PAGE>
<STARTMENU level="1"/>
<MENU topic="Home" link="VAR_ORIGINindex.html" mode="VAR_SEL_INDEX" />
<MENU topic="Features" link="VAR_ORIGINfeatures.html" mode="VAR_SEL_FEATURES" />
<MENU topic="Getting Started" link="VAR_ORIGINbuilding.html" mode="VAR_SEL_STARTED" />
<MENU topic="Mailing List / Help" link="VAR_ORIGINmail.html" mode="VAR_SEL_MAIL" />
<MENU topic="Contribute" link="VAR_ORIGINcontribute.html" mode="VAR_SEL_CONTRIBUTE" />
<MENU topic="Technical stuff" link="VAR_ORIGINtechnical.html" mode="VAR_SEL_TECHNICAL" />
<MENU topic="Home" link="index.html" mode="VAR_SEL_INDEX" />
<MENU topic="Features" link="features.html" mode="VAR_SEL_FEATURES" />
<MENU topic="Getting Started" link="building.html" mode="VAR_SEL_STARTED" />
<MENU topic="Mailing List / Help" link="mail.html" mode="VAR_SEL_MAIL" />
<MENU topic="Contribute" link="contribute.html" mode="VAR_SEL_CONTRIBUTE" />
<MENU topic="Technical stuff" link="technical.html" mode="VAR_SEL_TECHNICAL" />
<MENU topic="VPN Server" link="http://www.infradead.org/ocserv/" mode="VAR_SEL_SERVER" />
<MENU topic="OpenConnect VPN client" link="" mode="text" />
<ENDMENU />
Expand Down
6 changes: 3 additions & 3 deletions www/menu2-features.xml
View file
@@ -1,8 +1,8 @@
<PAGE>
<STARTMENU level="2"/>
<MENU topic="Feature list" link="features.html" mode="VAR_SEL_FEATURE_MAIN" />
<MENU topic="Running as non-root user" link="VAR_ORIGINnonroot.html" mode="VAR_SEL_FEATURE_NONROOT" />
<MENU topic="Cisco Secure Desktop" link="VAR_ORIGINcsd.html" mode="VAR_SEL_FEATURE_CSD" />
<MENU topic="GUI" link="VAR_ORIGINgui.html" mode="VAR_SEL_FEATURE_GUI" />
<MENU topic="Running as non-root user" link="nonroot.html" mode="VAR_SEL_FEATURE_NONROOT" />
<MENU topic="Cisco Secure Desktop" link="csd.html" mode="VAR_SEL_FEATURE_CSD" />
<MENU topic="GUI" link="gui.html" mode="VAR_SEL_FEATURE_GUI" />
<ENDMENU />
</PAGE>
8 changes: 4 additions & 4 deletions www/menu2-started.xml
View file
@@ -1,8 +1,8 @@
<PAGE>
<STARTMENU level="2"/>
<MENU topic="Building" link="VAR_ORIGINbuilding.html" mode="VAR_SEL_BUILDING" />
<MENU topic="vpnc-script" link="VAR_ORIGINvpnc-script.html" mode="VAR_SEL_VPNCSCRIPT" />
<MENU topic="Connecting" link="VAR_ORIGINconnecting.html" mode="VAR_SEL_CONNECTING" />
<MENU topic="Manual" link="VAR_ORIGINmanual.html" mode="VAR_SEL_MANUAL" />
<MENU topic="Building" link="building.html" mode="VAR_SEL_BUILDING" />
<MENU topic="vpnc-script" link="vpnc-script.html" mode="VAR_SEL_VPNCSCRIPT" />
<MENU topic="Connecting" link="connecting.html" mode="VAR_SEL_CONNECTING" />
<MENU topic="Manual" link="manual.html" mode="VAR_SEL_MANUAL" />
<ENDMENU />
</PAGE>
1 change: 0 additions & 1 deletion www/nonroot.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/packages.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/platforms.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>

<INCLUDE file="inc/header.tmpl" />
Expand Down
1 change: 0 additions & 1 deletion www/technical.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down
1 change: 0 additions & 1 deletion www/vpnc-script.xml
View file
@@ -1,5 +1,4 @@
<PAGE>
<VAR match="VAR_ORIGIN" replace="" />
<VAR match="VAR_CVSID" replace=""/>
<INCLUDE file="inc/header.tmpl" />

Expand Down

0 comments on commit 6654807

Please sign in to comment.