[phodav: 3/8] build-sys: rename spice/->bin/



commit 9fc2793aeecd2ee759f6592e41156597b40e2757
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Thu Mar 5 12:51:50 2020 +0100

    build-sys: rename spice/->bin/
    
    Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>

 {spice => bin}/map-drive.bat   | 0
 {spice => bin}/meson.build     | 0
 {spice => bin}/output-queue.c  | 0
 {spice => bin}/output-queue.h  | 0
 {spice => bin}/spice-webdavd.c | 0
 data/meson.build               | 2 +-
 data/spice-webdavd.wxs.in      | 2 +-
 meson.build                    | 2 +-
 8 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/spice/map-drive.bat b/bin/map-drive.bat
similarity index 100%
rename from spice/map-drive.bat
rename to bin/map-drive.bat
diff --git a/spice/meson.build b/bin/meson.build
similarity index 100%
rename from spice/meson.build
rename to bin/meson.build
diff --git a/spice/output-queue.c b/bin/output-queue.c
similarity index 100%
rename from spice/output-queue.c
rename to bin/output-queue.c
diff --git a/spice/output-queue.h b/bin/output-queue.h
similarity index 100%
rename from spice/output-queue.h
rename to bin/output-queue.h
diff --git a/spice/spice-webdavd.c b/bin/spice-webdavd.c
similarity index 100%
rename from spice/spice-webdavd.c
rename to bin/spice-webdavd.c
diff --git a/data/meson.build b/data/meson.build
index fa29171..c466030 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -46,7 +46,7 @@ if host_machine.system() == 'windows'
                         'VERSION' : proj_version,
                         'WINDOWS_PRODUCTVERSION' : win_version,
                         'WIXL_ARCH' : wixl_arch,
-                        'srcdir' : meson.current_source_dir(),
+                        'top_srcdir' : meson.source_root(),
                         'prefix' : prefix,
                       }
     )
diff --git a/data/spice-webdavd.wxs.in b/data/spice-webdavd.wxs.in
index 4ace378..e3a1de7 100644
--- a/data/spice-webdavd.wxs.in
+++ b/data/spice-webdavd.wxs.in
@@ -67,7 +67,7 @@
             <File Id='depstxt' Name='deps.txt' DiskId='1' Source='deps.txt' KeyPath='yes'/>
           </Component>
           <Component Id="CMapDrive" Guid="*">
-            <File Id='mapdrive' Name='map-drive.bat' DiskId='1' Source='@srcdir@/spice/map-drive.bat' 
KeyPath='yes'/>
+            <File Id='mapdrive' Name='map-drive.bat' DiskId='1' Source='@top_srcdir@/bin/map-drive.bat' 
KeyPath='yes'/>
           </Component>
         </Directory>
       </Directory>
diff --git a/meson.build b/meson.build
index 84e8bbd..34c83fd 100644
--- a/meson.build
+++ b/meson.build
@@ -53,7 +53,7 @@ endif
 
 subdir('po')
 subdir('libphodav')
-subdir('spice')
+subdir('bin')
 subdir('doc')
 subdir('data')
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]