Merge branch 'msvc-followup' into 'main'

Some updates to the NMake Makefiles

Closes #954

See merge request GNOME/librsvg!824

6 files changed, 24 insertions, 19 deletions

diff --git a/win32/MSVC-Builds.md b/win32/MSVC-Builds.md
index af994afb..6f85741d 100644
--- a/win32/MSVC-Builds.md
+++ b/win32/MSVC-Builds.md
@@ -110,7 +110,7 @@ Where:
 	   will also create and copy the `librsvg-2.0.pc` pkg-config file if

        Python can be found.

 

-*  `<path_options>` is as follows (plase note that paths with spaces

+*  `<path_options>` is as follows (please note that paths with spaces

    should be quoted):

     *  `PREFIX`: Root directory where built files will be copied to with

 	the `install` target.  This also determines the root directory from

diff --git a/win32/Makefile.vc b/win32/Makefile.vc
index 18cac2b7..4c47f2a9 100644
--- a/win32/Makefile.vc
+++ b/win32/Makefile.vc
@@ -41,19 +41,17 @@ all: $(RSVG_TOOLS) $(EXTRA_TARGETS) build-info-librsvg
 
 tests: all $(rsvg_tests)
 	@set PATH=$(BINDIR);$(PATH)
-	set G_TEST_SRCDIR=$(MAKEDIR)\..\tests
+	set G_TEST_SRCDIR=$(MAKEDIR)\..\librsvg-c\tests-c
 	@for %%x in ($(rsvg_tests)) do %%x
 
 rsvg_rust_tests:
-	@set PATH=%PATH%;%HOMEPATH%\.cargo\bin
-	@set CARGO_TARGET_DIR=..\win32\vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_c_api
+	@set PATH=$(BINDIR);%PATH%;%HOMEPATH%\.cargo\bin
 	@set GTK_LIB_DIR=$(LIBDIR);$(LIB)
-	$(RUSTUP_CMD)
-	@cd ..
-	$(CARGO_CMD:build=test) --verbose
-	@cd win32
+	@set SYSTEM_DEPS_LIBXML2_LIB=$(LIBXML2_LIB:.lib=)
+	@if not "$(PKG_CONFIG_PATH)" == "" set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
+	@if not "$(PKG_CONFIG)" == "" set PKG_CONFIG=$(PKG_CONFIG)
+	$(CARGO_CMD:build=test) $(RUST_VERBOSE_FLAG)
 	@set GTK_LIB_DIR=
-	@set CARGO_TARGET_DIR=
 
 # Include the rules for build directory creation and code generation
 !include generate-msvc.mak
diff --git a/win32/build-rules-msvc.mak b/win32/build-rules-msvc.mak
index cbc33507..910e385e 100644
--- a/win32/build-rules-msvc.mak
+++ b/win32/build-rules-msvc.mak
@@ -25,7 +25,7 @@ $<
 $<
 <<
 
-{..\tests\}.c{$(OUTDIR)\rsvg-tests\}.obj:
+{..\librsvg-c\tests-c\}.c{$(OUTDIR)\rsvg-tests\}.obj:
 	@if not exist $(@D)\ mkdir $(@D)
 	@if not exist $(@D)\..\librsvg\config.h copy .\config.h.win32 $(@D)\..\librsvg\config.h
 	$(CC) $(TEST_CFLAGS) $(LIBRSVG_LOG_DOMAIN) $(TOOLS_DEP_INCLUDES) /Fo$(@D)\ /Fd$(@D)\ /c @<<
@@ -134,6 +134,6 @@ clean:
 	@-rmdir /s /q $(OUTDIR)\rsvg-tests
 	@-rmdir /s /q $(OUTDIR)\rsvg-gdk-pixbuf-loader
 	@-rmdir /s /q $(OUTDIR)\librsvg
-	$(MAKE) /f rsvg-rust.mak CFG=$(CFG) cargo-clean
+	$(MAKE) /f rsvg-rust.mak CFG=$(CFG) RSVG_INTERNAL_LIB=$(RSVG_INTERNAL_LIB) cargo-clean
 	@-rmdir /s /q $(OUTDIR)\obj
 	@-del build-$(PLAT)-$(CFG)*.bat
diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in
index ce6cebd0..8529f3c9 100644
--- a/win32/config-msvc.mak.in
+++ b/win32/config-msvc.mak.in
@@ -63,6 +63,7 @@ BASE_DEP_INCLUDES =			\
 	/I$(INCLUDEDIR)\glib-2.0	\
 	/I$(LIBDIR)\glib-2.0\include	\
 	/I$(INCLUDEDIR)\harfbuzz	\
+	/I$(INCLUDEDIR)\cairo	\
 	/I$(INCLUDEDIR)
 
 BASE_DEP_LIBS =			\
@@ -106,7 +107,7 @@ TEST_DEP_LIBS =	\
 	fontconfig.lib
 !endif
 
-RSVG_INTERNAL_LIB = $(CARGO_TARGET_OUTPUT_DIR)\rsvg.lib
+RSVG_INTERNAL_LIB = $(CARGO_TARGET_OUTPUT_DIR)\librsvg_c.lib
 
 LIBRSVG_DEP_LIBS =			\
 	$(RSVG_INTERNAL_LIB)		\
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index 4a93afb8..cf5c30ed 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -33,13 +33,19 @@ generate-docs:
 # Generate NMake Makefiles (for git checkouts only)
 
 !ifndef IS_NOT_GIT
+# Either having python.exe your PATH will work or passing in
+# PYTHON=<full path to your Python interpretor> will do
+!ifndef PYTHON
+PYTHON=python
+!endif
+
 config.h.win32: ..\.git ..\configure.ac prebuild.py config.h.win32.in
 config-msvc.mak: ..\.git ..\configure.ac prebuild.py config-msvc.mak.in
 ..\include\librsvg\rsvg-version.h: ..\.git ..\configure.ac prebuild.py ..\include\librsvg\rsvg-version.h.in
 
 generate-nmake-files: config.h.win32 config-msvc.mak ..\include\librsvg\rsvg-version.h
-	@if not "$(PYTHON)" == "" $(PYTHON) prebuild.py
-	@if "$(PYTHON)" == "" echo You need to specify your Python interpreter PATH by passing in PYTHON^=^<full_path_to_python_interpreter^>
+	@echo If error meesages appear here you will need to pass in PYTHON=^<path_to_python.exe^>...
+	@$(PYTHON) prebuild.py
 
 remove-generated-nmake-files: ..\.git
 	@-del /f/q config-msvc.mak
diff --git a/win32/rsvg-rust.mak b/win32/rsvg-rust.mak
index 01e8e31b..ff8ef255 100644
--- a/win32/rsvg-rust.mak
+++ b/win32/rsvg-rust.mak
@@ -120,16 +120,16 @@ build-$(PLAT)-$(CFG).pre.bat:
 
 build-$(PLAT)-$(CFG)-lib.bat: build-$(PLAT)-$(CFG).pre.bat
 	@type $**>$@
-	@echo $(CARGO_CMD) $(RUST_VERBOSE_FLAG) --lib>>$@
+	@echo $(CARGO_CMD) $(RUST_VERBOSE_FLAG) --package librsvg-c>>$@
 
 build-$(PLAT)-$(CFG)-bin.bat: build-$(PLAT)-$(CFG).pre.bat
 	@type $**>$@
 	@echo $(CARGO_CMD) $(RUST_VERBOSE_FLAG) --bin rsvg-convert>>$@
 
-$(CARGO_TARGET_OUTPUT_DIR)\rsvg.lib: build-$(PLAT)-$(CFG)-lib.bat
+$(RSVG_INTERNAL_LIB): build-$(PLAT)-$(CFG)-lib.bat
 $(CARGO_TARGET_OUTPUT_DIR)\rsvg-convert.exe: build-$(PLAT)-$(CFG)-bin.bat
 
-$(CARGO_TARGET_OUTPUT_DIR)\rsvg.lib	\
+$(RSVG_INTERNAL_LIB)	\
 $(CARGO_TARGET_OUTPUT_DIR)\rsvg-convert.exe:
 	@echo Please do not manually close the command window that pops up...
 	@echo.
@@ -140,13 +140,13 @@ $(CARGO_TARGET_OUTPUT_DIR)\rsvg-convert.exe:
 	@start "Building the Rust bits for $(PLAT) Windows MSVC Build, please do not close this console window..." /wait /i cmd /c $**
 
 !else
-$(CARGO_TARGET_OUTPUT_DIR)\rsvg.lib:
+$(RSVG_INTERNAL_LIB):
 	@set PATH=%PATH%;%HOMEPATH%\.cargo\bin
 	@set GTK_LIB_DIR=$(LIBDIR);$(LIB)
 	@set SYSTEM_DEPS_LIBXML2_LIB=$(LIBXML2_LIB:.lib=)
 	@if not "$(PKG_CONFIG_PATH)" == "" set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 	@if not "$(PKG_CONFIG)" == "" set PKG_CONFIG=$(PKG_CONFIG)
-	$(CARGO_CMD) $(RUST_VERBOSE_FLAG) --lib
+	$(CARGO_CMD) $(RUST_VERBOSE_FLAG) --package librsvg-c
 	@set GTK_LIB_DIR=
 
 $(CARGO_TARGET_OUTPUT_DIR)\rsvg-convert.exe: