Skip to content

Commit

Permalink
switched to rsync 3.2.7; dropped Windows 32-bit support (Cywgin 32-bi…
Browse files Browse the repository at this point in the history
…t reached EOL Nov 2022)
  • Loading branch information
fracpete committed Jan 17, 2023
1 parent 9c1d2e8 commit 23aa590
Show file tree
Hide file tree
Showing 29 changed files with 9 additions and 172 deletions.
3 changes: 2 additions & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ For Windows, binaries are included in the jars and *rsync4j*
will set up an environment in the user's home directory (`%USERPROFILE%\rsync4j`)
on first usage (can be customized, see Section [Environment variables/Windows](env_vars/#windows)).

Supports 32-bit and 64-bit platforms.
In November 2022, the 32-bit version of Cygwin reached its end-of-life.
Therefore 32-bit support is only available up to version: 3.2.3-12
3 changes: 3 additions & 0 deletions docs/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ Current release:
* 3.2.3-12 ([zip](https://github.com/fracpete/rsync4j/releases/download/rsync4j-pom-3.2.3-12/rsync4j-all-3.2.3-12-bin.zip), [spring-boot](https://github.com/fracpete/rsync4j/releases/download/rsync4j-pom-3.2.3-12/rsync4j-all-3.2.3-12-spring-boot.jar))


Last version with Windows 32-bit support: **3.2.3-12**


Old releases:

* 3.2.3-11 ([zip](https://github.com/fracpete/rsync4j/releases/download/rsync4j-pom-3.2.3-11/rsync4j-all-3.2.3-11-bin.zip), [spring-boot](https://github.com/fracpete/rsync4j/releases/download/rsync4j-pom-3.2.3-11/rsync4j-all-3.2.3-11-spring-boot.jar))
Expand Down
37 changes: 1 addition & 36 deletions docs/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,46 +18,11 @@ You can place your ssh key pairs in the following directory:
%USERPROFILE%\rsync4j\home\%USERNAME%\.ssh
```

### Binaries (32-bit)
*rsync4j* uses the `rsync.exe`, `ssh.exe` and `ssh-keygen.exe` executables and
their dependencies from the 32-bit version of [cywgin](https://cygwin.com/).

The dependencies, as of 2022-11-17 (OpenSSH 9.1p1-1), are as follows:

* cygcom_err-2.dll
* cygcrypto-1.1.dll
* cyggcc_s-1.dll
* cyggssapi_krb5-2.dll
* cygiconv-2.dll
* cygintl-8.dll
* cygk5crypto-3.dll
* cygkrb5-3.dll
* cygkrb5support-0.dll
* cyglz4-1.dll
* cygwin1.dll
* cygz.dll
* cygzstd-1.dll

You can easily determine the dependencies by running the executables. Windows
will automatically pop up a dialog mentioning any DLLs that are missing. Place
any missing DLLs in the following directory:

```
rsync4j-windows32/src/main/resources/com/github/fracpete/rsync4j/windows32
```

And list the DLLs in the following text file:

```
rsync4j-windows32/src/main/resources/com/github/fracpete/rsync4j/windows32/libraries.txt
```


### Binaries (64-bit)
*rsync4j* uses the `rsync.exe`, `ssh.exe` and `ssh-keygen.exe` executables and
their dependencies from the 64-bit version of [cywgin](https://cygwin.com/).

The dependencies, as of 2022-11-17 (OpenSSH 9.1p1-1), are as follows:
The dependencies, as of 2023-01-18 (OpenSSH 9.1p1-1), are as follows:

* cygcom_err-2.dll
* cygcrypto-1.1.dll
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.github.fracpete</groupId>
<artifactId>rsync4j-pom</artifactId>
<version>3.2.3-13-SNAPSHOT</version>
<version>3.2.7-1-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
Expand Down Expand Up @@ -94,7 +94,6 @@

<modules>
<module>rsync4j-core</module>
<module>rsync4j-windows32</module>
<module>rsync4j-windows64</module>
<module>rsync4j-all</module>
</modules>
Expand Down
6 changes: 0 additions & 6 deletions rsync4j-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.github.fracpete</groupId>
<artifactId>rsync4j-windows32</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.github.fracpete</groupId>
<artifactId>rsync4j-windows64</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

/*
* Binaries.java
* Copyright (C) 2017-2022 University of Waikato, Hamilton, New Zealand
* Copyright (C) 2017-2023 University of Waikato, Hamilton, New Zealand
*/

package com.github.fracpete.rsync4j.core;
Expand Down Expand Up @@ -45,9 +45,6 @@ public class Binaries {
/** the resource prefix. */
public final static String RESOURCE_DIR = "com/github/fracpete/rsync4j/";

/** the sub-directory for the windows 32bit binaries. */
public final static String WINDOWS_DIR_32 = "windows32/";

/** the sub-directory for the windows 64bit binaries. */
public final static String WINDOWS_DIR_64 = "windows64/";

Expand Down Expand Up @@ -191,7 +188,7 @@ protected static String homeDir() {
*/
protected static String getWindowsDir() {
if (getBitness() == 32)
return WINDOWS_DIR_32;
throw new IllegalStateException("32-bit Windows is no longer supported! Last version with 32-bit support: 3.2.3-12");
else
return WINDOWS_DIR_64;
}
Expand Down
81 changes: 0 additions & 81 deletions rsync4j-windows32/pom.xml

This file was deleted.

28 changes: 0 additions & 28 deletions rsync4j-windows32/src/main/assembly/bin.xml

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 23aa590

Please sign in to comment.