[vlc-devel] commit: mozilla: keep projects/mozilla/install.js uptodate ( Jean-Paul Saman )

[git version control]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Fri Mar  6 15:47:38 2009 +0100| [0c58d4cb21e088b11fb41b32a3de4fdf2e4a6b3c] | committer: Jean-Paul Saman 

mozilla: keep projects/mozilla/install.js uptodate

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c58d4cb21e088b11fb41b32a3de4fdf2e4a6b3c
---

 configure.ac                   |    2 ++
 projects/mozilla/install.js    |   22 ----------------------
 projects/mozilla/install.js.in |   21 +++++++++++++++++++++
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/configure.ac b/configure.ac
index e504d08..9df2ae7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5851,6 +5851,7 @@ AC_SUBST(VERSION_MESSAGE)
 AC_SUBST(VERSION_MAJOR)
 AC_SUBST(VERSION_MINOR)
 AC_SUBST(VERSION_REVISION)
+AC_SUBST(VERSION_EXTRA)
 AC_SUBST(COPYRIGHT_YEARS)
 AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
 if test "${build_os}" = "cygwin"
@@ -5933,6 +5934,7 @@ AC_CONFIG_FILES([
   projects/activex/axvlc_rc.rc
   projects/mozilla/npvlc_rc.rc
   projects/mozilla/vlc.r
+  projects/mozilla/install.js
   share/Makefile
   share/vlc_win32_rc.rc
   share/libvlc_win32_rc.rc
diff --git a/projects/mozilla/install.js b/projects/mozilla/install.js
deleted file mode 100755
index 7b8e7fc..0000000
--- a/projects/mozilla/install.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var version = "0.8.6-rc1";
-
-initInstall( "VideoLAN", "VLC", version, 1);
-
-var tmpFolder = getFolder( "Temporary" );
-
-if ( ! fileExists( tmpFolder) )
-{
-	logComment( "Cannot find Temporary Folder!" );
-	cancelInstall();
-}
-
-
-setPackageFolder( tmpFolder );
-
-addFile( "http://downloads.videolan.org/pub/videolan/testing/0.8.6-rc1/win32/vlc-0.8.6-rc1-win32.exe" );
-
-var exe  = getFolder(tmpFolder, "vlc-0.8.6-rc1-win32.exe");
-File.execute( exe );
-
-performInstall();
-
diff --git a/projects/mozilla/install.js.in b/projects/mozilla/install.js.in
new file mode 100755
index 0000000..9e4f77d
--- /dev/null
+++ b/projects/mozilla/install.js.in
@@ -0,0 +1,21 @@
+var version = "@VERSION_MAJOR at .@VERSION_MINOR at .@VERSION_REVISION@@VERSION_EXTRA@";
+
+initInstall( "VideoLAN", "VLC", version, 1);
+
+var tmpFolder = getFolder( "Temporary" );
+
+if ( !fileExists( tmpFolder) )
+{
+    logComment( "Cannot find Temporary Folder!" );
+    cancelInstall();
+}
+
+setPackageFolder( tmpFolder );
+
+addFile( "http://downloads.videolan.org/pub/videolan/testing/@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_REVISION@@VERSION_EXTRA@/win32/vlc-@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_REVISION@@VERSION_EXTRA@-win32.exe" );
+
+var exe  = getFolder(tmpFolder, "vlc- at VERSION_MAJOR@. at VERSION_MINOR@. at VERSION_REVISION@@VERSION_EXTRA at -win32.exe");
+File.execute( exe );
+
+performInstall();
+