- Migrated the other projects to use patch files instead of a set of regular expressions for updating code.
Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/871e82fd Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/871e82fd Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/871e82fd Branch: refs/heads/master Commit: 871e82fd4c07e437fa24451c5002061a86125483 Parents: cc56123 Author: Christofer Dutz <[email protected]> Authored: Tue May 31 15:36:09 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Tue May 31 15:36:09 2016 +0200 ---------------------------------------------------------------------- google_maps/pom.xml | 34 ++++++++++++------------- jquery/pom.xml | 28 ++++++++++++--------- js/pom.xml | 64 ++++++++++++++++++++++-------------------------- 3 files changed, 63 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/871e82fd/google_maps/pom.xml ---------------------------------------------------------------------- diff --git a/google_maps/pom.xml b/google_maps/pom.xml index da0d2fa..fbc8ed3 100644 --- a/google_maps/pom.xml +++ b/google_maps/pom.xml @@ -59,34 +59,34 @@ </execution> </executions> </plugin> + <plugin> - <groupId>org.apache.flex.flexjs.compiler</groupId> - <artifactId>compiler-build-tools</artifactId> - <version>0.7.0-SNAPSHOT</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-patch-plugin</artifactId> + <version>1.2</version> + <configuration> + <patchDirectory>src/main/patch</patchDirectory> + <strip>5</strip> + <binary>true</binary> + </configuration> <executions> <execution> - <id>pre-process-sources</id> + <id>patch-google-maps</id> <phase>validate</phase> <goals> - <goal>pre-process-sources</goal> + <goal>apply</goal> </goals> <configuration> - <operations> - <replace-regexp-operation><match>\/\/ Namespace</match><replace>/** @const */</replace></replace-regexp-operation> - <replace-regexp-operation><match>google\.maps = \{\};</match><replace><![CDATA[ -/** @const */ -var google = {}; - -/** @const */ -google.maps = {};]]></replace></replace-regexp-operation> - </operations> - <includes> - <include>**/*.js</include> - </includes> + <patches> + <patch>google_maps.patch</patch> + </patches> + <ignoreWhitespace>true</ignoreWhitespace> + <targetDirectory>${project.build.directory}/downloads</targetDirectory> </configuration> </execution> </executions> </plugin> + <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/871e82fd/jquery/pom.xml ---------------------------------------------------------------------- diff --git a/jquery/pom.xml b/jquery/pom.xml index fb70991..cae22f2 100644 --- a/jquery/pom.xml +++ b/jquery/pom.xml @@ -59,28 +59,34 @@ </execution> </executions> </plugin> + <plugin> - <groupId>org.apache.flex.flexjs.compiler</groupId> - <artifactId>compiler-build-tools</artifactId> - <version>0.7.0-SNAPSHOT</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-patch-plugin</artifactId> + <version>1.2</version> + <configuration> + <patchDirectory>src/main/patch</patchDirectory> + <strip>5</strip> + <binary>true</binary> + </configuration> <executions> <execution> - <id>pre-jquery-dollar-global</id> + <id>patch-google-maps</id> <phase>validate</phase> <goals> - <goal>pre-process-sources</goal> + <goal>apply</goal> </goals> <configuration> - <operations> - <replace-regexp-operation><match>(\* @const\s+)([\*\s/]+var \$)</match><replace>$1* @type {jQuery}\n$2</replace></replace-regexp-operation> - </operations> - <includes> - <include>jquery-1.9.js</include> - </includes> + <patches> + <patch>jquery.patch</patch> + </patches> + <ignoreWhitespace>true</ignoreWhitespace> + <targetDirectory>${project.build.directory}/downloads</targetDirectory> </configuration> </execution> </executions> </plugin> + <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/871e82fd/js/pom.xml ---------------------------------------------------------------------- diff --git a/js/pom.xml b/js/pom.xml index 863643b..8d84ae5 100644 --- a/js/pom.xml +++ b/js/pom.xml @@ -71,41 +71,6 @@ <resource>externs.zip</resource> </configuration> </execution> - <execution> - <id>pre-process-javascript-sources-svg</id> - <phase>validate</phase> - <goals> - <goal>pre-process-sources</goal> - </goals> - <configuration> - <operations> - <replace-regexp-operation><match>@type \{function\(new:.*</match><replace/></replace-regexp-operation> - <replace-regexp-operation><match>Window\.prototype\..*</match><replace/></replace-regexp-operation> - <replace-regexp-operation><match>EventListener\|\(function\(Event\)</match><replace>EventListener|(function(!Event)</replace></replace-regexp-operation> - </operations> - <includes> - <include>svg.js</include> - </includes> - </configuration> - </execution> - <execution> - <id>pre-process-javascript-sources-es3</id> - <phase>validate</phase> - <goals> - <goal>pre-process-sources</goal> - </goals> - <configuration> - <operations> - <replace-regexp-operation><match>(The constructor of the current object\.\n.*)@type\s\{Function\}</match><replace>$1@type {Class}</replace></replace-regexp-operation> - <replace-regexp-operation><match>Object\.prototype\.constructor\s=\sfunction\(\)\s\{\};</match><replace>Object.prototype.constructor;</replace></replace-regexp-operation> - <replace-regexp-operation><match>(Transposes the elements of an array in place.*\n.*\n.*)(\n.*\s@this)</match><replace>$1\n \* @return {!Array<?>}$2</replace></replace-regexp-operation> - <replace-regexp-operation><match>(Sorts the elements of an array in place.*\n..*)(\n.*\s@param)</match><replace>$1\n \* @return {!Array<?>}$2</replace></replace-regexp-operation> - </operations> - <includes> - <include>es3.js</include> - </includes> - </configuration> - </execution> </executions> <!-- Dependency to the closure compiler externs artifact so @@ -119,6 +84,35 @@ </dependency> </dependencies> </plugin> + + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-patch-plugin</artifactId> + <version>1.2</version> + <configuration> + <patchDirectory>src/main/patch</patchDirectory> + <strip>5</strip> + <binary>true</binary> + </configuration> + <executions> + <execution> + <id>patch-google-maps</id> + <phase>validate</phase> + <goals> + <goal>apply</goal> + </goals> + <configuration> + <patches> + <patch>js.patch</patch> + </patches> + <ignoreWhitespace>true</ignoreWhitespace> + <targetDirectory>${project.build.directory}/downloads</targetDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId>
