<div class="gmail_quote">2010/10/11 <span dir="ltr"><<a href="mailto:git@videolan.org">git@videolan.org</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
vlc | branch: master | Rémi Denis-Courmont <<a href="mailto:remi@remlab.net">remi@remlab.net</a>> | Mon Oct 11 23:09:22 2010 +0300| [6a4df1923214a7ff27fbb5c55d6e807e1527b2c8] | committer: Rémi Denis-Courmont<br>
<br>
Ugly and almost working npapi build rules<br>
<br>
> <a href="http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6a4df1923214a7ff27fbb5c55d6e807e1527b2c8" target="_blank">http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6a4df1923214a7ff27fbb5c55d6e807e1527b2c8</a><br>
---<br>
<br>
Makefile.am | 40 ++++++++++++++++++----------------------<br>
extras/package/<a href="http://npapi.am" target="_blank">npapi.am</a> | 30 ++++++++++++++++++++++++++++++<br>
2 files changed, 48 insertions(+), 22 deletions(-)<br>
<br>
diff --git a/Makefile.am b/Makefile.am<br>
index a3a064d..b7404af 100644<br>
--- a/Makefile.am<br>
+++ b/Makefile.am<br>
@@ -695,6 +695,10 @@ win32_debugdir=$(top_builddir)/symbols-$(VERSION)<br>
win32_lua_destdir=$(win32_destdir)/lua<br>
win32_xpi_destdir=$(win32_destdir)/vlc-plugin<br>
<br>
+if HAVE_WIN32<br>
+include extras/package/<a href="http://npapi.am" target="_blank">npapi.am</a><br>
+endif<br>
+<br>
#Win-common is for win32 and wince<br>
package-win-common: install<br>
# Check that tmp isn't in the way<br>
@@ -792,9 +796,7 @@ if BUILD_OSDMENU<br>
rm -f -- "$$file.tmp"; \<br>
done<br>
endif<br>
-#if BUILD_MOZILLA<br>
-# cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)<br>
-#endif<br>
+ cp $(top_srcdir)/extras/mozilla/src/npvlc.dll.manifest $(win32_destdir)<br>
if BUILD_ACTIVEX<br>
cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)<br>
endif<br>
@@ -829,29 +831,23 @@ package-win-base: package-win-common<br>
fi ; \<br>
done<br>
<br>
-package-win32-webplugin-common: package-win-base<br>
-#if BUILD_MOZILLA<br>
-# mkdir -p "$(win32_xpi_destdir)/plugins"<br>
-# find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;<br>
-# cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"<br>
-# cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins"<br>
-# cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins"<br>
-# rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"<br>
-# rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"<br>
-#endif<br>
+package-win32-webplugin-common: package-win-base build-win-npapi<br>
+ mkdir -p "$(win32_xpi_destdir)/plugins"<br>
+ find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \;<br>
+ cp $(top_srcdir)/extras/mozilla/src/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins"<br>
+ cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins"<br>
+ cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins"<br>
+ rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"<br>
+ rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"<br>
<br>
package-win32-xpi: package-win32-webplugin-common<br>
-#if BUILD_MOZILLA<br>
-# cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"<br>
-# cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins<br>
-#endif<br>
+ cp $(top_builddir)/extras/mozilla/src/install.rdf "$(win32_xpi_destdir)"<br>
+ cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins<br>
<br>
package-win32-crx: package-win32-webplugin-common<br>
-#if BUILD_MOZILLA<br>
-# cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)"<br>
-# crxmake --pack-extension "$(win32_xpi_destdir)" \<br>
-# --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf<br>
-#endif<br>
+ cp $(top_builddir)/extras/mozilla/src/manifest.json "$(win32_xpi_destdir)"<br>
+ crxmake --pack-extension "$(win32_xpi_destdir)" \<br>
+ --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf<br>
<br>
package-win32-base-exe: package-win-base<br>
# Script installer<br>
diff --git a/extras/package/<a href="http://npapi.am" target="_blank">npapi.am</a> b/extras/package/<a href="http://npapi.am" target="_blank">npapi.am</a><br>
new file mode 100644<br>
index 0000000..26900d7<br>
--- /dev/null<br>
+++ b/extras/package/<a href="http://npapi.am" target="_blank">npapi.am</a><br>
@@ -0,0 +1,30 @@<br>
+#! /usr/bin/make -f<br>
+<br>
+build-npapi: stamp-npapi-build<br>
+<br>
+stamp-npapi-fetch:<br>
+ rm -Rf npapi-vlc<br>
+ git clone git://<a href="http://git.videolan.org/npapi-vlc.git" target="_blank">git.videolan.org/npapi-vlc.git</a> npapi-vlc<br>
+ touch $@<br></blockquote><div><br></div><div>This part is a bit problematic. Since it is automatically on (or at least I didn't find any disable switch) it forces make package-win-base and other make options to have internet connection. Also git still isn't the stablest tool under Win32 so personally I have to run it on other OS (I don't have git in my msys or cygwin compile environment).</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
+<br>
+stamp-npapi-autogen: stamp-npapi-fetch<br>
+# extras/package/<a href="http://npapi.am" target="_blank">npapi.am</a><br>
+ cd npapi-vlc && \<br>
+ $(SHELL) ./autogen.sh<br>
+ touch $@<br>
+<br>
+stamp-npapi-configure: stamp-npapi-autogen<br>
+ cd npapi-vlc && \<br>
+ $(SHELL) ./configure \<br>
+ --host=$(host_alias) --build=$(build_alias) \<br>
+ --with-mozilla-sdk-path="../$(srcdir)/extras/contrib/hosts/$(host_alias)/gecko-sdk" \<br>
+ CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" \<br>
+ CC="$(CC)" CFLAGS="$(CFLAGS)" \<br>
+ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \<br>
+ LD="$(LD)" LDFLAGS="$(LDFLAGS)" \<br>
+ PKG_CONFIG_LIBDIR="../$(srcdir)/extras/contrib/lib/pkgconfig:../src"<br>
+ touch $@<br>
+<br>
+stamp-npapi-build: stamp-npapi-configure<br>
+ cd npapi-vlc && \<br>
+ $(MAKE) $(MAKEFLAGS) all<br>
<br>
_______________________________________________<br>
vlc-commits mailing list<br>
<a href="mailto:vlc-commits@videolan.org">vlc-commits@videolan.org</a><br>
<a href="http://mailman.videolan.org/listinfo/vlc-commits" target="_blank">http://mailman.videolan.org/listinfo/vlc-commits</a><br>
</blockquote></div><br>