Changeset e104a2e689d4a1de68655d6e7936a6ceb87e6283

Timestamp:

05/22/08 18:32:56 (4 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1211473976 +0300

git-parent:

[3f02d5ddbd48efd89f6e3ffaff3e24e86220b52c]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1211473925 +0300

Message:

Use the same directory layout on all platforms.

It was an artificially-created mess. Besides, many other Windows
applications also have a data, datadir or share directory.

Files:

• Makefile.am (modified) (6 diffs)
• src/config/dirs.c (modified) (2 diffs)

Makefile.am

@@ -676 +676 @@
-    unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
-
-$(top_builddir)/vlc-$(VERSION)
+-p $(top_builddir)/vlc-$(VERSION)/share
-    cat $(top_srcdir)/po/LINGUAS | while read i; do \
-
+share/
-      cp "$(srcdir)/po/$${i}.gmo" \
-
+share/
-            || true ; \
-    done
-
-if BUILD_LUA
-
-
-
-
-lua/http/ ;
-lua/http/*.html ;
-lua/http/ ;
-lua/http/.hosts ;
-lua/http/ ;
-lua/http/*.css ;
-lua/http/js/ ;
-lua/http/js/*.js ;
-lua/http/dialogs/ ;
-lua/http/dialogs/* ;
-lua/http/dialogs/ ;
-lua/http/dialogs/.hosts ;
-lua/http/ ;
-
-lua/http/requests/ ;
-lua/http/requests/*.xml ;
-lua/http/requests/readme.txt ;
-lua/http/requests/readme.txt ;
+share/
+share/
+share/
+share/
+share/lua/http/
+share/lua/http/*.html
+share/lua/http/
+share/lua/http/.hosts
+share/lua/http/
+share/lua/http/*.css
+share/lua/http/js/
+share/lua/http/js/*.js
+share/lua/http/dialogs/
+share/lua/http/dialogs/*
+share/lua/http/dialogs/
+share/lua/http/dialogs/.hosts
+share/lua/http/
+share/
+share/lua/http/requests/
+share/lua/http/requests/*.xml
+share/lua/http/requests/readme.txt
+share/lua/http/requests/readme.txt
-endif
-
-if BUILD_HTTPD
-
-
-
-
-
-
-
-http/ ;
-http/*.html ;
-http/ ;
-http/.hosts ;
-http/ ;
-http/*.css ;
-http/js/ ;
-http/js/*.js ;
-http/dialogs/ ;
-http/dialogs/* ;
-http/dialogs/ ;
-http/dialogs/.hosts ;
-http/ ;
-
-http/requests/ ;
-http/requests/*.xml ;
-http/requests/readme.txt ;
-http/requests/readme.txt ;
-
-http/old/ ;
-http/old/*.html ;
-http/old/ ;
-http/old/ ;
-http/old/ ;
-http/old/vlm/ ;
-http/old/vlm/*.html ;
-http/old/admin/ ;
-http/old/admin/*.html ;
-http/old/admin/ ;
-
-
- ;
+share/
+share/
+share/
+share/
+share/
+share/
+share/
+share/http/
+share/http/*.html
+share/http/
+share/http/.hosts
+share/http/
+share/http/*.css
+share/http/js/
+share/http/js/*.js
+share/http/dialogs/
+share/http/dialogs/*
+share/http/dialogs/
+share/http/dialogs/.hosts
+share/http/
+share/
+share/http/requests/
+share/http/requests/*.xml
+share/http/requests/readme.txt
+share/http/requests/readme.txt
+
+share/http/old/
+share/http/old/*.html
+share/http/old/
+share/http/old/
+share/http/old/
+share/http/old/vlm/
+share/http/old/vlm/*.html
+share/http/old/admin/
+share/http/old/admin/*.html
+share/http/old/admin/
+
+
+
-
-if BUILD_MOZILLA
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla"
- ;
+
-endif
-
-if BUILD_ACTIVEX
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex"
- ;
- ;
- ;
-
- ;
+
+
+
+
+
-endif
-# Rebase all those DLLs to speed up loading (need cygwin rebase)
@@ -795 +795 @@
-    mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
-    for i in $(srcdir)/share/skins2/fonts/*.*; do \
-$$i $(top_builddir)/vlc-$(VERSION)
+-- "$$i" $(top_builddir)/vlc-$(VERSION)/share
-    done
-    for i in $(srcdir)/share/skins2/*.*; do \
-$$i $(top_builddir)/vlc-$(VERSION)
+-- "$$i" $(top_builddir)/vlc-$(VERSION)/share
-    done
-endif
@@ -804 +804 @@
-if BUILD_LUA
-#Lua Scripts
-cripts
+hare/lua
-    for i in $(srcdir)/share/lua/playlist/*.* ; do \
-$${i} $(top_builddir)/vlc-$(VERSION)/scripts
- ;
-cripts
+-- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua
+
+hare/lua
-    for i in $(srcdir)/share/lua/meta/*.* ; do \
-$${i} $(top_builddir)/vlc-$(VERSION)/scripts
- ;
-cripts
+-- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua
+
+hare/lua
-    for i in $(srcdir)/share/lua/intf/*.* ; do \
-$${i} $(top_builddir)/vlc-$(VERSION)/scripts
- ;
-cripts
+-- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua
+
+hare/lua
-    for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
-$${i} $(top_builddir)/vlc-$(VERSION)/scripts
- ;
+-- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua
+
-endif
-
-if BUILD_OSDMENU
-#OSD Menu
-
-
+share/
+share/
-    for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
-
-.*
-$$file "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir" || true
+share/
+ 
+-- "$$file" "$(top_builddir)/vlc-$(VERSION)/share/osdmenu/$$dir"
-        done; \
-    done
-
-
-if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi
-if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi
-$$file.tmp
+share/
+share/
+sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? 
+sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? 
+-- "$$file.tmp"
-    done
-endif
@@ -917 +917 @@
-
-# Copy relevant files
- ;
+
-    cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \
- ;
+
-
-# Create debug package
- ;
- ;
- ;
+
+
+
-    (cd $(srcdir)/tmp && zip -9 -r vlc-$(VERSION)-BeOS-debug.zip vlc-$(VERSION) )
- ;
- ;
+
+
-
-# Create normal package
- ;
+
-    find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \
- ;
- ;
- ;
- ;
+
+
+
+
-    (cd $(srcdir)/tmp &&  zip -9 -r vlc-$(VERSION)-BeOS.zip vlc-$(VERSION) )
- ;
+
-
-# Clean up
- ;
+
-
-package-macosx:
@@ -962 +962 @@
-          cp -R  extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \
-      cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
- ;
+
-
-# Place a link to the application folder
- ;
+
-
-# Create disk image (temporarily taken from the 0.8.6-bugfix branch to provide reliable NBs)
- ;
- ;
+
+
-    hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" \
- ;
- ;
- ;
+
+
+
-
-# Create disk image 
- ;
- ;
+
+
-#   hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" \
-#     "$(top_builddir)/vlc-$(VERSION).dmg" -format UDRW \
- ;
+
-
-# Make sure the root window of the dmg will pop up when the dmg is mounted.
-# Note: We dont mount in /Volumes to be sure we won't collide with an other
-# finder mounted dmg with the same name.
- ;
- ;
- ;
- ;
+
+
+
+
-#   sleep 1 # Make sure operation completes
-#   cd "$(srcdir)"
-
-# Unmount the image now
- ;
- ;
+
+
-
-# Make sure the image is not writable
-# Note: We can't directly create a read only dmg as we do the bless stuff
- ;
- ;
- ;
- ;
+
+
+
+
-
-# We are done
- ;
- ;
+
+
-
-# Clean up
- ;
+
-
-package-macosx-zip:
@@ -1057 +1057 @@
-    hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \
-      "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDZO \
- ;
+
-    echo "Disk image creation completed:"
-    rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)"

src/config/dirs.c

@@ -54 +54 @@
-const char *config_GetDataDir( void )
-{
-
-
-
+
-    static char path[PATH_MAX] = "";
-
@@ -78 +76 @@
-const char *config_GetConfDir( void )
-{
-
-
-
+
-    static char path[PATH_MAX] = "";
-