RetroShare / RSNewWebUI

30 stars 20 forks source link

Fixed native Windows build with qmake #68

Closed thunder2 closed 1 year ago

csoler commented 1 year ago

I'm wondering about the test "win32-g++:isEmpty(QMAKE_SH)". Is the "else" part also executed when the system is not win32 ?

thunder2 commented 1 year ago

The check win32-g++ can be native MinGW (standard Qt installation) or MinGW inside MSYS2. The variable QMAKE_SH is set when sh.exe is found and this is when running inside MSYS2. With MSYS2 the linux shell is available and the script build.sh can be used. For native Windows build I have to use build.bat. The batch file currently creates all files at once so I don't need more build steps and I create the output files directly inside the shadow build folder to keep the source folder clear. The step "clean_webfiles" is to remove the output folder with "make clean". I don't know who is responsible for MSYS2 build and I don't know how they want to build the package. But I think we should create the output files for all builds in the shadow folder.

csoler commented 1 year ago

ok. And INTALLS is only mentionned in the second part. Does the first part put the compiled files in the right place?

thunder2 commented 1 year ago

The first part (then) creates the files only in the shadow build folder. The INSTALL is currently configured for Linux build only and have to be added for Windows too. On Windows I use an extra pack script under "build_scripts/Windows/build" after "make" which copies all files from the shadow build folder to the output folder.

thunder2 commented 1 year ago

Maybe we should use the first part for MSYS2 build too. I will look into the build scripts of MSYS2. Please wait with the PR.

thunder2 commented 1 year ago

Now it works with MSYS2 too. I will commit the modified build scripts later in RS repo.

csoler commented 1 year ago

Should we wait before merging this then?

thunder2 commented 1 year ago

For me its ok when you merge it. After that I commit my changes for the Windows build into the RS repository.

defnax commented 8 months ago

i have issue on macos os with these lines

src=$(readlink -f $(dirname $0))/../../webui-src

if [ "$1" = "" ]; then
    publicdest=../../webui
    src=..
    publicdest=$(readlink -f $(dirname $0))/../../webui