Commit 4d1bf4e5 authored by Administrator's avatar Administrator

Fixes project configuration error for Windows 32 bit systems

The name of the Gecko driver was incorrect for Windows 32 bit
architectures, as the prefix used was "win86" instead of "win32".

In addition, the Gecko driver storage path into maven local repository
has been simplified.
parent 7500d0da
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<groupId>es.uvigo.esei.daa</groupId> <groupId>es.uvigo.esei.daa</groupId>
<artifactId>example</artifactId> <artifactId>example</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>0.1.1</version> <version>0.1.2</version>
<name>DAA Example</name> <name>DAA Example</name>
<licenses> <licenses>
...@@ -597,14 +597,14 @@ ...@@ -597,14 +597,14 @@
<id>download-geckodriver</id> <id>download-geckodriver</id>
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<configuration> <configuration>
<tasks> <target>
<mkdir dir="${geckodriver.basepath}" /> <mkdir dir="${geckodriver.basepath}" />
<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" <get src="${geckodriver.url}" dest="${geckodriver.compressed.path}"
skipexisting="true" /> skipexisting="true" />
<untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}" <untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}"
compression="gzip" /> compression="gzip" />
<chmod file="${geckodriver.uncompressed.path}" perm="a+x" /> <chmod file="${geckodriver.uncompressed.path}" perm="a+x" />
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
</activation> </activation>
<properties> <properties>
<geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.zip</geckodriver.url> <geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.zip</geckodriver.url>
<geckodriver.basepath>${settings.localRepository}${file.separator}geckodriver${file.separator}${os.name}${file.separator}${os.arch}${file.separator}${project.build.directory}${file.separator}</geckodriver.basepath> <geckodriver.basepath>${settings.localRepository}${file.separator}geckodriver${file.separator}${os.name}${file.separator}${os.arch}</geckodriver.basepath>
<geckodriver.compressed.path>${geckodriver.basepath}${file.separator}geckodriver-${geckodriver.version}-${geckodriver.suffix}.zip</geckodriver.compressed.path> <geckodriver.compressed.path>${geckodriver.basepath}${file.separator}geckodriver-${geckodriver.version}-${geckodriver.suffix}.zip</geckodriver.compressed.path>
<geckodriver.uncompressed.path>${geckodriver.basepath}${file.separator}geckodriver.exe</geckodriver.uncompressed.path> <geckodriver.uncompressed.path>${geckodriver.basepath}${file.separator}geckodriver.exe</geckodriver.uncompressed.path>
</properties> </properties>
...@@ -640,13 +640,13 @@ ...@@ -640,13 +640,13 @@
<id>download-geckodriver</id> <id>download-geckodriver</id>
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<configuration> <configuration>
<tasks> <target>
<mkdir dir="${geckodriver.basepath}" /> <mkdir dir="${geckodriver.basepath}" />
<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" <get src="${geckodriver.url}" dest="${geckodriver.compressed.path}"
skipexisting="true" /> skipexisting="true" />
<unzip src="${geckodriver.compressed.path}" dest="${file.separator}${geckodriver.basepath}" /> <unzip src="${geckodriver.compressed.path}" dest="${file.separator}${geckodriver.basepath}" />
<chmod file="${geckodriver.uncompressed.path}" perm="a+x" /> <chmod file="${geckodriver.uncompressed.path}" perm="a+x" />
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
...@@ -706,7 +706,7 @@ ...@@ -706,7 +706,7 @@
</os> </os>
</activation> </activation>
<properties> <properties>
<geckodriver.suffix>win86</geckodriver.suffix> <geckodriver.suffix>win32</geckodriver.suffix>
</properties> </properties>
</profile> </profile>
...@@ -720,7 +720,7 @@ ...@@ -720,7 +720,7 @@
<properties> <properties>
<geckodriver.suffix>mac</geckodriver.suffix> <geckodriver.suffix>mac</geckodriver.suffix>
<geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.url> <geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.url>
<geckodriver.basepath>${settings.localRepository}${file.separator}geckodriver${file.separator}${os.name}${file.separator}${os.arch}${file.separator}${project.build.directory}${file.separator}</geckodriver.basepath> <geckodriver.basepath>${settings.localRepository}${file.separator}geckodriver${file.separator}${os.name}${file.separator}${os.arch}</geckodriver.basepath>
<geckodriver.compressed.path>${geckodriver.basepath}${file.separator}geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.compressed.path> <geckodriver.compressed.path>${geckodriver.basepath}${file.separator}geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.compressed.path>
<geckodriver.uncompressed.path>${geckodriver.basepath}${file.separator}geckodriver</geckodriver.uncompressed.path> <geckodriver.uncompressed.path>${geckodriver.basepath}${file.separator}geckodriver</geckodriver.uncompressed.path>
</properties> </properties>
...@@ -735,14 +735,14 @@ ...@@ -735,14 +735,14 @@
<id>download-geckodriver</id> <id>download-geckodriver</id>
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<configuration> <configuration>
<tasks> <target>
<mkdir dir="${geckodriver.basepath}" /> <mkdir dir="${geckodriver.basepath}" />
<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" <get src="${geckodriver.url}" dest="${geckodriver.compressed.path}"
skipexisting="true" /> skipexisting="true" />
<untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}" <untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}"
compression="gzip" /> compression="gzip" />
<chmod file="${geckodriver.uncompressed.path}" perm="a+x" /> <chmod file="${geckodriver.uncompressed.path}" perm="a+x" />
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment