[haiku-commits] haiku.r1alpha4: hrevr1alpha4-44689 - build/jam
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 7 Nov 2012 14:01:04 +0100 (CET)
hrevr1alpha4-44689 adds 3 changesets to branch 'r1alpha4'
old head: 15cad347fb5a1b88fadbaf1b205000c8316a54c0
new head: 9d53613524174450103a16ef7297c049a5039c7d
----------------------------------------------------------------------------
92f0883: KeymapSwitcher package updated to version 1.2.7.5
* Fixed issue with unwanted keymap switching in case UnZip started in
* background (expanding optional packages during Haiku build, for
* example). UnZip executable has no background application flag
* for unknown reason.
+alpha4
[ Siarzhuk Zharski <zharik@xxxxxx> ]
8a0905a: R1A4: Add KeymapSwitcher into image
* This is a modified hrev44784
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
9d53613: Ensure that KeymapSwitcher does not get stripped on Release build.
See #8603 for history.
[ Siarzhuk Zharski <zharik@xxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 7 insertions(+), 4 deletions(-)
build/jam/OptionalPackages | 10 ++++++----
build/jam/ReleaseBuildProfiles | 1 +
############################################################################
Commit: 92f0883bd984540571974cba0e32a2baef5c84b1
URL: http://cgit.haiku-os.org/haiku/commit/?id=92f0883
Author: Siarzhuk Zharski <zharik@xxxxxx>
Date: Tue Nov 6 19:05:48 2012 UTC
Committer: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Commit-Date: Wed Nov 7 12:28:11 2012 UTC
KeymapSwitcher package updated to version 1.2.7.5
* Fixed issue with unwanted keymap switching in case UnZip started in
* background (expanding optional packages during Haiku build, for
* example). UnZip executable has no background application flag
* for unknown reason.
+alpha4
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 6beb5dc..6dcff09 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1157,12 +1157,12 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
-
KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-09-09.zip
- :
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-09-09.zip ;
+
KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-11-01.zip
+ :
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-11-01.zip ;
} else {
InstallOptionalHaikuImagePackage
-
KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-08-31.zip
- :
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-08-31.zip ;
+
KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-11-01.zip
+ :
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-11-01.zip ;
}
AddSymlinkToHaikuImage home config settings deskbar Preferences
: /boot/common/bin/KeymapSwitcher ;
############################################################################
Commit: 8a0905a42c900e9ae13068d5a4143d99d1f092c5
URL: http://cgit.haiku-os.org/haiku/commit/?id=8a0905a
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Nov 7 12:29:52 2012 UTC
R1A4: Add KeymapSwitcher into image
* This is a modified hrev44784
----------------------------------------------------------------------------
diff --git a/build/jam/ReleaseBuildProfiles b/build/jam/ReleaseBuildProfiles
index be35d7f..3e1632e 100644
--- a/build/jam/ReleaseBuildProfiles
+++ b/build/jam/ReleaseBuildProfiles
@@ -25,6 +25,7 @@ switch $(HAIKU_BUILD_PROFILE) {
WebPositive WonderBrush ;
AddOptionalHaikuImagePackages Development Git OpenSSH OpenSSL ;
AddOptionalHaikuImagePackages Nano P7zip Welcome BeBook
XZ-Utils ;
+ AddOptionalHaikuImagePackages KeymapSwitcher ;
AddOptionalHaikuImagePackages wpa_supplicant ;
}
############################################################################
Revision: hrevr1alpha4-44689
Commit: 9d53613524174450103a16ef7297c049a5039c7d
URL: http://cgit.haiku-os.org/haiku/commit/?id=9d53613
Author: Siarzhuk Zharski <zharik@xxxxxx>
Date: Tue Nov 6 21:16:51 2012 UTC
Committer: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Commit-Date: Wed Nov 7 12:30:05 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/8603
Ensure that KeymapSwitcher does not get stripped on Release build.
See #8603 for history.
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 6dcff09..70a435b 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1158,11 +1158,13 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-11-01.zip
- :
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-11-01.zip ;
+ :
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc4-2012-11-01.zip
+ : : : false ;
} else {
InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-11-01.zip
- :
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-11-01.zip ;
+ :
$(baseURL)/KeymapSwitcher-1.2.7-r1a4-x86-gcc2-2012-11-01.zip
+ : : : false ;
}
AddSymlinkToHaikuImage home config settings deskbar Preferences
: /boot/common/bin/KeymapSwitcher ;
Other related posts:
- » [haiku-commits] haiku.r1alpha4: hrevr1alpha4-44689 - build/jam - kallisti5
