Skip to content

Commit

Permalink
build: Support 32 bit Windows installation (#116)
Browse files Browse the repository at this point in the history
  • Loading branch information
kumaraditya303 committed Dec 14, 2020
1 parent e25f32d commit fa2e0f0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Expand Up @@ -11,7 +11,9 @@

# Maven output dir
target/

.project
.classpath
.settings
.DS_Store
*.swp
.vscode
Expand Down
Expand Up @@ -53,7 +53,7 @@ public class DriverJar extends Driver {
private static String platformDir() {
String name = System.getProperty("os.name").toLowerCase();
if (name.contains("windows")) {
return "win32_x64";
return System.getProperty("os.arch").equals("amd64") ? "win32_x64" : "win32";
}
if (name.contains("linux")) {
return "linux";
Expand All @@ -69,7 +69,8 @@ private static Path extractResource(Path from, Path toDir) throws IOException {
Files.copy(from, path);
path.toFile().setExecutable(true);
path.toFile().deleteOnExit();
// System.out.println("extracting: " + from.toString() + " to " + path.toString());
// System.out.println("extracting: " + from.toString() + " to " +
// path.toString());
return path;
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/download_driver_for_all_platforms.sh
Expand Up @@ -19,7 +19,7 @@ fi
mkdir -p driver
cd driver

for PLATFORM in mac linux win32_x64
for PLATFORM in mac linux win32 win32_x64
do
FILE_NAME=$FILE_PREFIX-$PLATFORM.zip
if [[ -d $PLATFORM ]]; then
Expand Down
7 changes: 5 additions & 2 deletions scripts/install_local_driver.sh
Expand Up @@ -29,10 +29,13 @@ Linux)
FILE_NAME=${FILE_PREFIX}-linux.zip
echo "Downloading driver for Linux"
;;
MINGW*)
FILE_NAME=${FILE_PREFIX}-win32_x64.zip
MINGW32*)
FILE_NAME=${FILE_PREFIX}-win32.zip
echo "Downloading driver for Windows"
;;
MINGW64*)
FILE_NAME=${FILE_PREFIX}-win32_x64.zip
echo "Downloading driver for Windows"
*)
echo "Unknown platform '$(uname)'"
exit 1;
Expand Down

0 comments on commit fa2e0f0

Please sign in to comment.