[haiku-commits] haiku: hrev47124 - src/data/etc build/jam/images/definitions build/jam/repositories/HaikuPorts src/data

  • From: korli@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 17 Apr 2014 23:21:45 +0200 (CEST)

hrev47124 adds 1 changeset to branch 'master'
old head: 29a4992cda9f0a43fe06e8c53f25b3d4f24f653e
new head: 4a4450c15871177aa94c7958353f281af3e53e4c
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=4a4450c+%5E29a4992

----------------------------------------------------------------------------

4a4450c: less: sysless config file is part of the hpkg.
  
  * remove in-tree sysless config gen.

                                   [ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev47124
Commit:      4a4450c15871177aa94c7958353f281af3e53e4c
URL:         http://cgit.haiku-os.org/haiku/commit/?id=4a4450c
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Thu Apr 17 21:13:41 2014 UTC

----------------------------------------------------------------------------

7 files changed, 4 insertions(+), 25 deletions(-)
build/jam/images/definitions/minimum       |  2 +-
build/jam/repositories/HaikuPorts/x86      |  2 +-
build/jam/repositories/HaikuPorts/x86_64   |  2 +-
build/jam/repositories/HaikuPorts/x86_gcc2 |  2 +-
src/data/Jamfile                           |  1 -
src/data/etc/Jamfile                       | 14 --------------
src/data/etc/sysless.in                    |  6 ------

----------------------------------------------------------------------------

diff --git a/build/jam/images/definitions/minimum 
b/build/jam/images/definitions/minimum
index 1db281d..8d6782d 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -263,7 +263,7 @@ local etcDir = [ FDirName $(HAIKU_TOP) data etc ] ;
 local etcFiles = inputrc profile ;
 etcFiles = $(etcFiles:G=etc) ;
 SEARCH on $(etcFiles) = $(etcDir) ;
-etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
+etcFiles += <etc>termcap ;
 AddFilesToHaikuImage system settings etc : $(etcFiles) ;
 
 local profileFiles = [ Glob $(etcDir)/profile.d : *.sh ] ;
diff --git a/build/jam/repositories/HaikuPorts/x86 
b/build/jam/repositories/HaikuPorts/x86
index db3c1a3..de87bf2 100644
--- a/build/jam/repositories/HaikuPorts/x86
+++ b/build/jam/repositories/HaikuPorts/x86
@@ -65,7 +65,7 @@ RemotePackageRepository HaikuPorts
        jpeg_devel-9-3
        jpeg_tools-9-3
        keymapswitcher-1.2.7.10-1
-       less-451-3      
+       less-451-4      
        libedit-2012_06_01_3.0-1
        libedit_devel-2012_06_01_3.0-1
        libiconv-1.13.1-6
diff --git a/build/jam/repositories/HaikuPorts/x86_64 
b/build/jam/repositories/HaikuPorts/x86_64
index 89a8977..af910b1 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -63,7 +63,7 @@ RemotePackageRepository HaikuPorts
        jpeg_devel-9-3
        jpeg_tools-9-3
        keymapswitcher-1.2.7.10-1
-       less-451-3
+       less-451-4
        libedit-2012_06_01_3.0-1
        libiconv-1.13.1-6
        libiconv_devel-1.13.1-6
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 9f14678..946a3a0 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -81,7 +81,7 @@ RemotePackageRepository HaikuPorts
        keymapswitcher-1.2.7.11-1
        lcms-2.5-1
        lcms_devel-2.5-1        
-       less-451-2
+       less-451-4
        lha-1.14i-1
        libao-1.0.0-1
        libao_devel-1.0.0-1
diff --git a/src/data/Jamfile b/src/data/Jamfile
index cefdb5a..6e51e71 100644
--- a/src/data/Jamfile
+++ b/src/data/Jamfile
@@ -1,7 +1,6 @@
 SubDir HAIKU_TOP src data ;
 
 HaikuSubInclude deskbar ;
-HaikuSubInclude etc ;
 HaikuSubInclude keyboard_layouts ;
 HaikuSubInclude keymaps ;
 HaikuSubInclude mime_db ;
diff --git a/src/data/etc/Jamfile b/src/data/etc/Jamfile
deleted file mode 100644
index 61ba62c..0000000
--- a/src/data/etc/Jamfile
+++ /dev/null
@@ -1,14 +0,0 @@
-SubDir HAIKU_TOP src data etc ;
-
-# generate /etc/sysless
-actions LessKey
-{
-       lesskey -o $(1) $(2)
-}
-
-local syslessIn = <etc>sysless.in ;
-SEARCH on $(syslessIn) = $(SUBDIR) ;
-local sysless = <etc>sysless ;
-MakeLocateArch $(sysless) ;
-Depends $(sysless) : $(syslessIn) ;
-LessKey $(sysless) : $(syslessIn) ;
diff --git a/src/data/etc/sysless.in b/src/data/etc/sysless.in
deleted file mode 100644
index 9727ebd..0000000
--- a/src/data/etc/sysless.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#command
-\177   back-screen
-^H             back-screen
-#line-edit
-\177   backspace
-^H             backspace


Other related posts:

  • » [haiku-commits] haiku: hrev47124 - src/data/etc build/jam/images/definitions build/jam/repositories/HaikuPorts src/data - korli