opendev/gerrit
Code Issues Proposed changes

Remove partial browser builds

Browse Source 
Maven cannot be trusted to produce a release build without someone
checking a file that does not live under version control is correctly
configured. Drop the per-browser alternative switches to ensure
the build always creates all permutations for all browsers.

Change-Id: Ie9d7f23afc725f9411b371c231a21a19523df034
This commit is contained in:
Shawn Pearce
2013-05-06 16:10:00 -07:00
parent 52eb7e9763
commit 96f54ae3e9
4 changed files with 2 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/dev-release.txt
View File

@@ -138,16 +138,8 @@ Build Gerrit
* Build the Gerrit WAR
+
====
rm -f ~/.m2/settings.xml
./tools/release.sh
====
+
[WARNING]
========================================================================
Make sure you are compiling the release for all browsers. Check in your
Maven `~/.m2/settings.xml` file that no Maven profile is active that
limits the compilation to a certain browser.
========================================================================
* Sanity check WAR
* Test the new Gerrit version

53
gerrit-gwtui/pom.xml
View File

@@ -151,53 +151,6 @@ limitations under the License.
</dependency>
</dependencies>
<profiles>
<profile>
<id>all</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<GerritGwtUI.browserType>com.google.gerrit.GerritGwtUI</GerritGwtUI.browserType>
<GerritGwtUI.draftCompile>false</GerritGwtUI.draftCompile>
</properties>
</profile>
<profile>
<id>safari</id>
<properties>
<GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIsafari</GerritGwtUI.browserType>
<GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
</properties>
</profile>
<profile>
<id>chrome</id>
<properties>
<GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIsafari</GerritGwtUI.browserType>
<GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
</properties>
</profile>
<profile>
<id>webkit</id>
<properties>
<GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIsafari</GerritGwtUI.browserType>
<GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
</properties>
</profile>
<profile>
<id>gecko1_8</id>
<properties>
<GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIgecko1_8</GerritGwtUI.browserType>
<GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
</properties>
</profile>
<profile>
<id>firefox</id>
<properties>
<GerritGwtUI.browserType>com.google.gerrit.GerritGwtUIgecko1_8</GerritGwtUI.browserType>
<GerritGwtUI.draftCompile>true</GerritGwtUI.draftCompile>
</properties>
</profile>
</profiles>
<build>
<plugins>
@@ -208,12 +161,11 @@ limitations under the License.
<execution>
<id>optimized</id>
<configuration>
<module>${GerritGwtUI.browserType}</module>
<module>com.google.gerrit.GerritGwtUI</module>
<extraJvmArgs>-Xmx512m</extraJvmArgs>
<compileReport>${gwt.compileReport}</compileReport>
<disableClassMetadata>true</disableClassMetadata>
<disableCastChecking>true</disableCastChecking>
<draftCompile>${GerritGwtUI.draftCompile}</draftCompile>
</configuration>
<goals>
<goal>compile</goal>
@@ -223,11 +175,10 @@ limitations under the License.
<id>debug</id>
<configuration>
<style>PRETTY</style>
<module>${GerritGwtUI.browserType}</module>
<module>com.google.gerrit.GerritGwtUI</module>
<extraJvmArgs>-Xmx512m</extraJvmArgs>
<disableClassMetadata>true</disableClassMetadata>
<disableRunAsync>true</disableRunAsync>
<draftCompile>true</draftCompile>
<webappDirectory>${project.build.directory}/${project.build.finalName}_dbg</webappDirectory>
</configuration>
<goals>

20
gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIgecko1_8.gwt.xml
View File

@@ -1,20 +0,0 @@
<!--
Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<module rename-to="gerrit_ui">
<inherits name='com.google.gerrit.GerritGwtUI'/>
<set-property name="user.agent" value="gecko1_8" />
<set-property name="locale" value="default" />
</module>

20
gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIsafari.gwt.xml
View File

@@ -1,20 +0,0 @@
<!--
Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<module rename-to="gerrit_ui">
<inherits name='com.google.gerrit.GerritGwtUI'/>
<set-property name="user.agent" value="safari" />
<set-property name="locale" value="default" />
</module>