[Spice-commits] 3 commits - configure.ac SpiceXPI/Makefile.am SpiceXPI/src

[Christophe Fergau]

 SpiceXPI/Makefile.am            |    4 ++--
 SpiceXPI/src/plugin/resource.rc |    2 +-
 configure.ac                    |    1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 56ff6800618b855260b6b72b84d692eac2fa7db8
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Apr 17 13:24:35 2013 +0200

    build: Make sure $(PYTHON) is set when building xpi
    
    Python is needed to generate nsISpicec.h and nsISpicec.xpt from
    nsISpicec.idl.

diff --git a/configure.ac b/configure.ac
index 39a1f7e..4a79626 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,7 @@ AC_ARG_ENABLE([xpi],
                   [Enable compilation of an xpi package])],
   [], [enable_xpi=no])
 if test x"$enable_xpi" != xno; then
+AM_PATH_PYTHON
 PKG_CHECK_MODULES(XUL, libxul-embedding >= 10)
 AC_SUBST(XUL_CFLAGS)
 AC_SUBST(XUL_LIBS)
commit 50ca07ab673b10d7d4605d64f56988f6110c5729
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Apr 17 13:24:01 2013 +0200

    build: Use correct plugin name in Windows resource file
    
    The nsISpicec -> npSpiceConsole rename was not propagated there.

diff --git a/SpiceXPI/src/plugin/resource.rc b/SpiceXPI/src/plugin/resource.rc
index 8892b0a..38a50d2 100644
--- a/SpiceXPI/src/plugin/resource.rc
+++ b/SpiceXPI/src/plugin/resource.rc
@@ -20,7 +20,7 @@ BEGIN
             VALUE "FileVersion", "2, 8, 0, 0"
             VALUE "InternalName", "SpiceXPI"
             VALUE "LegalCopyright", "Fedora"
-            VALUE "OriginalFilename", "nsISpicec.dll"
+            VALUE "OriginalFilename", "npSpiceConsole.dll"
             VALUE "ProductName", "Spice XPI"
             VALUE "ProductVersion", "2, 8, 0, 0"
             VALUE "MIMEType", "application/x-spice"
commit 13889e35ab10f577e83a20a88697ef2581ab3469
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed Apr 17 13:22:14 2013 +0200

    build: Adjust plugin name when building xpi
    
    The plugin binary name was changed from libnsISpice to npSpiceConsole,
    but the Makefile.am rule optionnally building SpiceXpi.xpi was not
    changed to take this rename into account.

diff --git a/SpiceXPI/Makefile.am b/SpiceXPI/Makefile.am
index de058b5..a12135a 100644
--- a/SpiceXPI/Makefile.am
+++ b/SpiceXPI/Makefile.am
@@ -9,12 +9,12 @@ all-local: SpiceXPI.xpi
 
 CLEANFILES = SpiceXPI.xpi
 
-SpiceXPI.xpi: $(srcdir)/src/install.rdf src/plugin/nsISpicec.xpt src/plugin/.libs/libnsISpicec.so
+SpiceXPI.xpi: $(srcdir)/src/install.rdf src/plugin/nsISpicec.xpt src/plugin/.libs/npSpiceConsole.so
 	$(AM_V_GEN)rm -rf $(DISTDIR)
 	@[ -d $(DISTDIR)/plugins ] || mkdir -p $(DISTDIR)/plugins
 	@cp $(srcdir)/src/install.rdf $(DISTDIR)
 	@cp src/plugin/*.xpt $(DISTDIR)/plugins
-	@cp src/plugin/.libs/libnsISpicec.so $(DISTDIR)/plugins/nsISpicec.so
+	@cp src/plugin/.libs/npSpiceConsole.so $(DISTDIR)/plugins/npSpiceConsole.so
 	@(cd $(DISTDIR); zip -q -r ../$@ .)
 
 distclean-local: