GNOME.org
 

[gjs/meson.msvc] win32/README.txt: Move to $(srcroot)/README.MSVC.md

commit d5353dcc105f8049a4f3b06e5152c1fffed7ece9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Oct 28 17:15:22 2019 +0800

    win32/README.txt: Move to $(srcroot)/README.MSVC.md
    
    ...and add information in there to tell people how to build with Meson.

 Makefile.am                        |   2 +-
 win32/README.txt => README.MSVC.md | 119 ++++++++++++++++++++++++++-----------
 2 files changed, 85 insertions(+), 36 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f2504950..9a5a9c97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -193,6 +193,7 @@ EXTRA_DIST +=                                       \
        libgjs.symbols                          \
        meson.build                             \
        meson_options.txt                       \
+       README.MSVC.md                          \
        subprojects/glib.wrap                   \
        subprojects/gobject-introspection.wrap  \
        subprojects/libffi.wrap                 \
@@ -211,7 +212,6 @@ EXTRA_DIST +=                                       \
        win32/install.mak                       \
        win32/introspection-msvc.mak            \
        win32/Makefile.vc                       \
-       win32/README.txt                        \
        $(NULL)
 
 # Colin's handy Makefile bits for:
diff --git a/win32/README.txt b/README.MSVC.md
similarity index 52%
rename from win32/README.txt
rename to README.MSVC.md
index 81c8b7e0..dfa9fba9 100644
--- a/win32/README.txt
+++ b/README.MSVC.md
@@ -2,30 +2,34 @@ Instructions for building GJS on Visual Studio
 ==============================================
 Building the GJS on Windows is now supported using Visual Studio
 versions 2017 15.6.x or later in both 32-bit and 64-bit (x64) flavors,
-via NMake Makefiles.  Due to C++-14 usage, Visual Studio 2015 or
-earlier is not supported, nor is Visual Studio 2017 15.5.x or earlier,
-as the compiler flag /Zc:externConstexpr is needed.
+via NMake Makefiles and Meson.  Due to C++-14 usage, Visual Studio
+2017 15.6.x or later is required, as the compiler flag
+/Zc:externConstexpr is needed.
 
 You will need the following items to build GJS using Visual Studio:
--SpiderMonkey 60 (mozjs-60).  Please see the below section carefully on this...
--GObject-Introspection (G-I) 1.41.4 or later
--GLib 2.54.x or later, (which includes GIO, GObject, and the associated tools)
--Cairo including Cairo-GObject support, unless NO_CAIRO=1 is specified.
--GTK+-3.20.x or later, unless NO_GTK=1 is specified.
+-SpiderMonkey 60 (mozjs-60).  Please see the below section carefully 
+ on this...
+-GObject-Introspection (G-I) 1.61.2 or later
+-GLib 2.58.x or later, (which includes GIO, GObject, and the associated tools)
+-Cairo including Cairo-GObject support (Optional; specify NO_CAIRO=14
+ to disable Cairo support in the NMake Makefiles)
+-GTK+-3.20.x or later (Optional, specify NO_GTK=1 to disable GTK+
+ support in the NMake Makefiles)
 -and anything that the above items depends on.
 
 Note that SpiderMonkey must be built with Visual Studio, and the rest
-should preferably be built with Visual Studio as well.  The Visual Studio
-version used should preferably be the one that is used here to build GJS.
+should preferably be built with Visual Studio as well.  The Visual 
+Studio version used should preferably be the one that is used here
+to build GJS.
 
 Be aware that it is often hard to find a suitable source release for
 SpiderMonkey nowadays, so it may be helpful to look in
 
 ftp://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/
 
-for the suitable release series of SpiderMonkey that corresponds to the GJS
-version that is being built, as GJS depends on ESR (Extended Service Release,
-a.k.a Long-term support) releases of SpiderMonkey.
+for the suitable release series of SpiderMonkey that corresponds to 
+the GJS version that is being built, as GJS depends on ESR (Extended 
+Service Release, a.k.a Long-term support) releases of SpiderMonkey.
 
 Please do note that the build must be done carefully, in addition to the
 official instructions that are posted on the Mozilla website:
@@ -48,20 +52,23 @@ somewhere in the build tree (which, you can safely delete after building
 SpiderMonkey).  The --host=... and --target=... are absolutely required for x64
 builds, as per the Mozilla's SpiderMonkey build instructions.
 
-You may want to pass in --disable-js-shell to not build the JS shell that comes
-with SpiderMonkey to save time, and perhaps use --with-system-nspr (instead of
-the --enable-nspr-build as above), --with-system-zlib and --with-system-icu if
-you know what you are doing and that their pkg-config files (or headers/LIB's)
-can be found directly or using configuration options, to further save time.
+You may want to pass in --disable-js-shell to not build the JS
+shell that comes with SpiderMonkey to save time, and perhaps
+use --with-system-nspr (instead of the --enable-nspr-build as
+above), --with-system-zlib and --with-system-icu if you know
+what you are doing and that their pkg-config files
+(or headers/LIB's) can be found directly or using configuration 
+options, to further save time.
 
 After the configuration finishes successfully, you may run 'mozmake' and
 'mozmake install' as you would for a standard SpiderMonkey build.  If
-'mozmake install' does not work for you for some reason, the DLLs you need
-and js.exe (if you did not pass in --disable-js-shell) can be found in
-$(buildroot)/dist/bin (you need *all* the DLLs, make sure that there is no
-mozglue.dll, otherwise you will need to redo your build as noted above),
-and the required headers are found in $(buildroot)/dist/include.  Note that
-for PDB files and .lib files, you will need to search for them in $(buildroot),
+'mozmake install' does not work for you for some reason, the DLLs you 
+need and js.exe (if you did not pass in --disable-js-shell) can be 
+found in $(buildroot)/dist/bin (you need *all* the DLLs, make sure 
+that there is no mozglue.dll, otherwise you will need to redo your 
+build as noted above), and the required headers are found in
+$(buildroot)/dist/include.  Note that for PDB files and .lib files, 
+you will need to search for them in $(buildroot),
 where the PDB file names match the filenames for the DLLs/EXEs in
 $(buildroot)/dist/bin, and you will need to look for the following .lib files:
 -mozjs-60.lib
@@ -70,15 +77,31 @@ $(buildroot)/dist/bin, and you will need to look for the following .lib files:
 -plc4.lib (optional, recommended for future use, if --enable-nspr-build is used)
 -plds4.lib (optional, recommended for future use, if --enable-nspr-build is used)
 
-You may want to put the .lib's and DLLs/EXEs into $(PREFIX)\lib and $(PREFIX)\bin
-respectively, and put the headers into $(PREFIX)\include\mozjs-60 for convenience.
-
-The following are instructions for performing such a build, as there is a
-number of build configurations supported for the build.  Note that the default
-build (where no options (see below) are specified, the GJS library is built with
-Cairo and GTK+ support.  A 'clean' target is provided-it is recommended that
-one cleans the build and redo the build if any configuration option changed.  An
-'install' target is also provided to copy the built items in their appropriate
+You may want to put the .lib's and DLLs/EXEs into $(PREFIX)\lib and 
+$(PREFIX)\bin respectively, and put the headers into
+$(PREFIX)\include\mozjs-60 for convenience.
+
+For Meson builds, you will need to place the generated mozjs-60.pc
+pkg-config file into $(PREFIX)\lib\pkgconfig and ensure that
+pkg-config can find it by setting PKG_CONFIG_PATH.  Ensure
+that the 'includedir' and 'libdir' in there is correct, and remove
+the 'nspr' entry from the 'Requires.private:' line and change
+'-include ${includedir}/mozjs-60/js/RequiredDefines.h' to
+'-FI${includedir}/mozjs-60/js/RequiredDefines.h', so that the
+mozjs-60.pc can be used correctly in Visual Studio builds.  You
+will also need to ensure that the existing GObject-Introspection
+installation (if used) is on the same drive where the GJS sources
+are (and therefore where the GJS build is being carried out).
+
+To perform an NMake build:
+==========================
+The following are instructions for performing such a build, as there 
+is a number of build configurations supported for the build.  Note 
+that the default build (where no options (see below) are specified, 
+the GJS library is built with Cairo and GTK+ support.  A 'clean' 
+target is provided-it is recommended that one cleans the build and 
+redo the build if any configuration option changed.  An 'install' 
+target is also provided to copy the built items in their appropriate
 locations under $(PREFIX), which is described below.
 
 Invoke the build by issuing the command:
@@ -115,5 +138,31 @@ INTROSPECTION: Enable build of introspection files, for making
 PYTHON: Full path to the Python interpreter to be used, if it is not in %PATH%.
         This is necessary for building the introspection files (INTROSPECTION=1).
 
-LIBTOOL_DLL_NAME: Enable libtool-style DLL names.  Note this does not make this
-                  GJS build usable by other compilers, due to C++ usage.
+LIBTOOL_DLL_NAME: Enable libtool-style DLL names.  Note this does not 
+make this GJS build usable by other compilers, due to C++ usage.
+
+==================================
+To carry out the build using Meson
+==================================
+In addition to the requirements listed in the NMake builds,
+you need to install Python 3.5.x or later, as well as the
+pkg-config tool, Meson (via pip) and Ninja (unless using
+--backend=vs[2017|2019]).  Perform a build by doing the
+following, in an appropriate Visual Studio command prompt
+in an empty build directory:
+
+meson <path_to_gjs_sources> --buildtype=... --prefix=<some_prefix> -Dskip_dbus_tests=true 
<--backend=vs[2017|2019]>
+
+(Note that -Dskip_dbus_tests=true is required for MSVC builds; please
+see the Meson documentation for the values accepted by buildtype)
+
+You may want to view the build options after the configuration succeeds
+by using 'meson configure'
+
+When the configuration succeeds, run:
+ninja
+(to build the sources, or open the generated .sln file using
+Visual Studio 2017 or 2019 if --backend=vs[2017|2019] is used)
+
+You may choose to install the build results using 'ninja install'
+or running the 'install' project when the build succeeds.
\ No newline at end of file
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]