Skip to content

Commit bd6c856

Browse files
HannesWellHannesWell
committed
Group eclipse and equinox folders in websites folder for clarification
1 parent e754f41 commit bd6c856

18 files changed

Lines changed: 24 additions & 38 deletions

File tree

‎JenkinsJobs/shared/utilities.groovy‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,24 +102,16 @@ def pgpSignFile(String filePath, String client = '', String gpgHome = null) {
102102
// --- website generation ---
103103

104104
def copyStaticWebsiteFiles(String gitRoot, String website) {
105-
def pathToReplace;
106-
if (website.startsWith('eclipse')) {
107-
pathToReplace = '..'
108-
} else if (website.startsWith('equinox')) {
109-
pathToReplace = '../../eclipse'
110-
} else {
111-
error("Unknown website: ${website}")
112-
}
113105
sh """#!/bin/bash -xe
114-
cp -r ${gitRoot}/sites/${website}/. .
106+
cp -r ${gitRoot}/sites/websites/${website}/. .
115107
116108
# Copy the share files into this the current stite to make each site self-contained
117109
cp ${gitRoot}/sites/eclipse/page.css .
118110
cp ${gitRoot}/sites/eclipse/page.js .
119111
# Replace references to shared java-script/css files to contained files
120112
find . -type f -name "*.html" -exec sed --in-place \
121-
--expression='s|${pathToReplace}/page.js">|page.js">|g' \
122-
--expression='s|${pathToReplace}/page.css" />|page.css" />|g' \
113+
--expression='s|../../page.js">|page.js">|g' \
114+
--expression='s|../../page.css" />|page.css" />|g' \
123115
{} +
124116
"""
125117
}

‎sites/.gitignore‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎sites/equinox/README.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎sites/websites/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.json
2+
*.xml
3+
*/build/buildUnstable

sites/eclipse/README.md renamed to sites/websites/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Eclipse Build websites
1+
# Eclipse and Equinox Build websites
22

33
The websites for all Eclipse and Equinox builds and their overview pages are based on plain HTML pages, that read their individual information from data files (in JSON format) and apply them via _JavaScript_.
44
All data files of each website are contained within the root folder of each site and all sites are generally self-contained.
@@ -29,8 +29,8 @@ and from the archived build artifacts download all files as ZIP-archive in the f
2929
to get a full Eclipse respectivly Equinox drop locally.
3030
Unzip the archives to a location of your choise and launch the RelEng Java programs with the corresponding System-properties pointing to these drop folders accordingly.
3131

32-
## Launching a web-server
32+
## Launching a local web-server
3333

34-
Launch `jwebserver` from this or the parent folder (requires a JDK-18 or later on `PATH`)
34+
Launch `jwebserver` from this folder (requires a JDK-18 or later on `PATH`)
3535
and open the localhost URL displayed on the console (by default `http://localhost:8000/`).
3636
Run `jwebserver --help` for help and further options.

sites/eclipse/build/buildlogs/logs.html renamed to sites/websites/eclipse/build/buildlogs/logs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<head>
55
<title>RelEng Logs</title>
66
<meta name="keywords" content="eclipse,equinox,jdt,pde,swt,plug-ins,project,plugins,java,ide,free java ide,tools,platform,open source,development environment,development" />
7-
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
8-
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
7+
<link rel="preconnect stylesheet" href="../../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
8+
<script src="../../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
99
</head>
1010

1111
<body>

sites/eclipse/build/index.html renamed to sites/websites/eclipse/build/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<head>
55
<title>Eclipse Project Downloads</title>
66
<meta name="keywords" content="eclipse,equinox,jdt,pde,swt,plug-ins,project,plugins,java,ide,free java ide,tools,platform,open source,development environment,development" />
7-
<link rel="preconnect stylesheet" href="../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
8-
<script src="../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
7+
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
8+
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
99
</head>
1010

1111
<body>

sites/eclipse/build/reports.html renamed to sites/websites/eclipse/build/reports.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<head>
55
<title>Reports</title>
66
<meta name="keywords" content="eclipse,equinox,jdt,pde,swt,plug-ins,project,plugins,java,ide,free java ide,tools,platform,open source,development environment,development" />
7-
<link rel="preconnect stylesheet" href="../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
8-
<script src="../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
7+
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
8+
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
99
</head>
1010

1111
<body>

sites/eclipse/build/testresults/logs.html renamed to sites/websites/eclipse/build/testresults/logs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<head>
55
<title>Test Logs</title>
66
<meta name="keywords" content="eclipse,equinox,jdt,pde,swt,plug-ins,project,plugins,java,ide,free java ide,tools,platform,open source,development environment,development" />
7-
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
8-
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
7+
<link rel="preconnect stylesheet" href="../../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
8+
<script src="../../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
99
</head>
1010

1111
<body>

sites/eclipse/overview/images/build_done.svg renamed to sites/websites/eclipse/overview/images/build_done.svg

File renamed without changes.

0 commit comments

Comments
 (0)