Skip to content

[Build] Restore compressed content.xml for platform repository #3191

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

Merged
merged 1 commit into from
Jul 19, 2025
Merged

[Build] Restore compressed content.xml for platform repository #3191

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
82 changes: 0 additions & 82 deletions cje-production/promotion/promoteSites.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,87 +235,6 @@ function addRepoProperties ()
${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vmargs ${MIRRORS_URL_ARG} -Dp2ArtifactRepositoryName="${ART_REPO_NAME}" -Dp2MetadataRepositoryName="${CON_REPO_NAME}" ${ART_REPO_ARG} ${CON_REPO_ARG}
}

function createXZ
{
BUILDMACHINE_SITE=$1

CONTENT_JAR_FILE="${BUILDMACHINE_SITE}/content.jar"
if [[ ! -e "${CONTENT_JAR_FILE}" ]]
then
echo -e "\n\tERROR: content.jar file did not exist at ${BUILDMACHINE_SITE}."
return 1
fi
ARTIFACTS_JAR_FILE="${BUILDMACHINE_SITE}/artifacts.jar"
if [[ ! -e "${ARTIFACTS_JAR_FILE}" ]]
then
echo -e "\n\tERROR: artifacts.jar file did not exist at ${BUILDMACHINE_SITE}."
return 1
fi

# Notice we overwrite the XML files, if they already exists.
unzip -q -o "${CONTENT_JAR_FILE}" -d "${BUILDMACHINE_SITE}"
RC=$?
if [[ $RC != 0 ]]
then
echo "ERROR: could not unzip ${CONTENT_JAR_FILE}."
return $RC
fi
# Notice we overwrite the XML files, if they already exists.
unzip -q -o "${ARTIFACTS_JAR_FILE}" -d "${BUILDMACHINE_SITE}"
RC=$?
if [[ $RC != 0 ]]
then
echo "ERROR: could not unzip ${ARTIFACTS_JAR_FILE}."
return $RC
fi

CONTENT_XML_FILE="${BUILDMACHINE_SITE}/content.xml"
ARTIFACTS_XML_FILE="${BUILDMACHINE_SITE}/artifacts.xml"
# We will check the content.xml and artifacts.xml files really exists. In some strange world, the jars could contain something else.
if [[ ! -e "${CONTENT_XML_FILE}" || ! -e "${ARTIFACTS_XML_FILE}" ]]
then
echo -e "\n\tERROR: content.xml or artifacts.xml file did not exist as expected at ${BUILDMACHINE_SITE}."
return 1
fi

# finally, compress them, using "extra effort"
# Notice we use "force" to over write any existing file, presumably there from a previous run?
XZ_EXE=$(which xz)
if [[ $? != 0 || -z "${XZ_EXE}" ]]
then
echo -e "\n\tERROR: xz executable did not exist."
return 1
fi
echo -e "\n\tXZ compression of ${CONTENT_XML_FILE} ... "
$XZ_EXE -e --force "${CONTENT_XML_FILE}"
RC=$?
if [[ $RC != 0 ]]
then
echo "ERROR: could not compress, using $XZ_EXE -e ${CONTENT_XML_FILE}."
return $RC
fi

echo -e "\tXZ compression of ${ARTIFACTS_XML_FILE} ... "
$XZ_EXE -e --force "${ARTIFACTS_XML_FILE}"
RC=$?
if [[ $RC != 0 ]]
then
echo "ERROR: could not compress, using $XZ_EXE -e ${ARTIFACTS_XML_FILE}."
return $RC
fi


# Notice we just write over any existing p2.index file.
# May want to make backup of this and other files, for production use.
P2_INDEX_FILE="${BUILDMACHINE_SITE}/p2.index"
echo "version=1" > "${P2_INDEX_FILE}"
echo "metadata.repository.factory.order= content.xml.xz,content.xml,!" >> "${P2_INDEX_FILE}"
echo "artifact.repository.factory.order= artifacts.xml.xz,artifacts.xml,!" >> "${P2_INDEX_FILE}"
echo -e "\tCreated ${P2_INDEX_FILE}"

return 0
}

DROP_ID=$(echo $DROP_ID|tr -d ' ')

if [[ -z "${DROP_ID}" ]]
Expand Down Expand Up @@ -670,7 +589,6 @@ then
pushd ${LOCAL_REPO}
BUILDMACHINE_SITE=${LOCAL_REPO}/${REPO_ID}
addRepoProperties ${BUILDMACHINE_SITE} ${REPO_SITE_SEGMENT} ${DL_DROP_ID}
createXZ ${BUILDMACHINE_SITE}
mv ${REPO_ID} ${DL_DROP_ID}
scp -r ${LOCAL_REPO}/${DL_DROP_ID} [email protected]:/home/data/httpd/download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}
popd
Expand Down
5 changes: 5 additions & 0 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@
<bundle id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
<bundle id="org.eclipse.equinox.slf4j"/>
<bundle id="org.eclipse.debug.terminal"/>
<iu>
<query>
<expression type="match">id == 'org.eclipse.equinox.executable'</expression>
</query>
</iu>
</site>
51 changes: 0 additions & 51 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/cp-content.xsl
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,74 +52,6 @@
<includeAllSources>true</includeAllSources>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>unpack-content-jar</id>
<phase>package</phase>
<configuration>
<target>
<unjar
src="target/repository/content.jar"
dest="target/repository" />
<delete file="target/repository/content.jar" />
<delete file="target/repository/content.xml.xz" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-extra-iu</id>
<phase>package</phase>
<goals>
<goal>transform</goal>
</goals>
</execution>
</executions>
<configuration>
<transformationSets>
<transformationSet>
<dir>target/repository</dir>
<includes>
<include>content.xml</include>
</includes>
<stylesheet>cp-content.xsl</stylesheet>
</transformationSet>
</transformationSets>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-extra-iu</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/repository</outputDirectory>
<resources>
<resource>
<directory>${basedir}/target/generated-resources/xml/xslt</directory>
<includes>
<include>content.xml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-p2-extras-plugin</artifactId>
Expand Down
Loading