Skip to content

Make eclipse and equinox website folder names more clear #3813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
HannesWell wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Make eclipse and equinox website folder names more clear #3813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions JenkinsJobs/shared/utilities.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,16 @@ def pgpSignFile(String filePath, String client = '', String gpgHome = null) {
// --- website generation ---

def copyStaticWebsiteFiles(String gitRoot, String website) {
def pathToReplace;
if (website.startsWith('eclipse')) {
pathToReplace = '..'
} else if (website.startsWith('equinox')) {
pathToReplace = '../../eclipse'
} else {
error("Unknown website: ${website}")
}
sh """#!/bin/bash -xe
cp -r ${gitRoot}/sites/${website}/. .
cp -r ${gitRoot}/sites/websites/${website}/. .

# Copy the share files into this the current stite to make each site self-contained
cp ${gitRoot}/sites/eclipse/page.css .
cp ${gitRoot}/sites/eclipse/page.js .
# Replace references to shared java-script/css files to contained files
find . -type f -name "*.html" -exec sed --in-place \
--expression='s|${pathToReplace}/page.js">|page.js">|g' \
--expression='s|${pathToReplace}/page.css" />|page.css" />|g' \
--expression='s|../../page.js">|page.js">|g' \
--expression='s|../../page.css" />|page.css" />|g' \
{} +
"""
}
Expand Down
6 changes: 0 additions & 6 deletions sites/.gitignore
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions sites/equinox/README.md
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions sites/websites/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.json
*.xml
*/build/buildUnstable
6 changes: 3 additions & 3 deletions sites/eclipse/README.md → sites/websites/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Eclipse Build websites
# Eclipse and Equinox Build websites

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_.
All data files of each website are contained within the root folder of each site and all sites are generally self-contained.
Expand Down Expand Up @@ -29,8 +29,8 @@ and from the archived build artifacts download all files as ZIP-archive in the f
to get a full Eclipse respectivly Equinox drop locally.
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.

## Launching a web-server
## Launching a local web-server

Launch `jwebserver` from this or the parent folder (requires a JDK-18 or later on `PATH`)
Launch `jwebserver` from this folder (requires a JDK-18 or later on `PATH`)
and open the localhost URL displayed on the console (by default `http://localhost:8000/`).
Run `jwebserver --help` for help and further options.
4 changes: 2 additions & 2 deletions sites/eclipse/build/buildlogs/logs.html → ...ebsites/eclipse/build/buildlogs/logs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<head>
<title>RelEng Logs</title>
<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" />
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
<link rel="preconnect stylesheet" href="../../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions sites/eclipse/build/index.html → sites/websites/eclipse/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<head>
<title>Eclipse Project Downloads</title>
<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" />
<link rel="preconnect stylesheet" href="../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions sites/eclipse/build/reports.html → sites/websites/eclipse/build/reports.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<head>
<title>Reports</title>
<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" />
<link rel="preconnect stylesheet" href="../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions sites/eclipse/build/testresults/logs.html → ...sites/eclipse/build/testresults/logs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<head>
<title>Test Logs</title>
<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" />
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
<link rel="preconnect stylesheet" href="../../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
</head>

<body>
Expand Down
0 sites/eclipse/overview/images/build_done.svg → ...es/eclipse/overview/images/build_done.svg
View file
Open in desktop
File renamed without changes
0 sites/eclipse/overview/images/junit.svg → ...ebsites/eclipse/overview/images/junit.svg
View file
Open in desktop
File renamed without changes
0 sites/eclipse/overview/images/runtests.svg → ...ites/eclipse/overview/images/runtests.svg
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions sites/eclipse/overview/index.html → sites/websites/eclipse/overview/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<head>
<title>Eclipse Project Downloads</title>
<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" />
<link rel="preconnect stylesheet" href="../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions sites/equinox/build/index.html → sites/websites/equinox/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<head>
<title>Equinox Build</title>
<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" />
<link rel="preconnect stylesheet" href="../../eclipse/page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../eclipse/page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
</head>

<!-- TODO: Add Equinox favicon?-->
Expand Down
4 changes: 2 additions & 2 deletions sites/equinox/overview/index.html → sites/websites/equinox/overview/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<head>
<title>Equinox Downloads</title>
<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" />
<link rel="preconnect stylesheet" href="../../eclipse/page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../eclipse/page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
<link rel="preconnect stylesheet" href="../../page.css" /><!-- Replaced by a refernece to a contained copy on deployment -->
<script src="../../page.js"></script><!-- Replaced by a refernece to a contained copy on deployment -->
</head>
<!-- TODO: Add Equinox favicon?-->

Expand Down
0 sites/eclipse/page.css → sites/websites/page.css
View file
Open in desktop
File renamed without changes.
0 sites/eclipse/page.js → sites/websites/page.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion sites/eclipse/testDataFetch.sh → sites/websites/testDataFetch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildID=$1
# This script Requires jq: https://jqlang.org/download/

# Work from the directory containing the eclipse and equinox website
cd $(dirname "$0")/..
cd $(dirname "$0")

find eclipse -type f -name "*.json" -delete
find equinox -type f -name "*.json" -delete
Expand Down
Loading