Index: branches/blackosx/package/BootOptions/Resolution.txt
===================================================================
--- branches/blackosx/package/BootOptions/Resolution.txt (revision 0)
+++ branches/blackosx/package/BootOptions/Resolution.txt (revision 1578)
@@ -0,0 +1,11 @@
+1024x600x32:Graphics Mode=1024x600x32
+1024x768x32:Graphics Mode=1024x768x32
+1280x768x32:Graphics Mode=1280x768x32
+1280x800x32:Graphics Mode=1280x800x32
+1280x960x32:Graphics Mode=1280x960x32
+1280x1024x32:Graphics Mode=1280x1024x32
+1440x900x32:Graphics Mode=1440x900x32
+1600x900x32:Graphics Mode=1600x900x32
+1680x1050x32:Graphics Mode=1680x1050x32
+1920x1080x32:Graphics Mode=1920x1080x32
+1920x1200x32:Graphics Mode=1920x1200x32
Index: branches/blackosx/package/BootOptions/Video.txt
===================================================================
--- branches/blackosx/package/BootOptions/Video.txt (revision 0)
+++ branches/blackosx/package/BootOptions/Video.txt (revision 1578)
@@ -0,0 +1,4 @@
+GraphicsEnabler:GraphicsEnabler=Yes
+UseAtiROM:UseAtiROM=Yes
+UseNvidiaROM:UseNvidiaROM=Yes
+VBIOS:VBIOS=Yes
Index: branches/blackosx/package/BootOptions/PowerManagement.txt
===================================================================
--- branches/blackosx/package/BootOptions/PowerManagement.txt (revision 0)
+++ branches/blackosx/package/BootOptions/PowerManagement.txt (revision 1578)
@@ -0,0 +1,7 @@
+CSTUsingSystemIO:CSTUsingSystemIO=Yes
+DropSSDT:DropSSDT=Yes
+EnableC2State:EnableC2State=Yes
+EnableC3State:EnableC3State=Yes
+EnableC4State:EnableC4State=Yes
+GenerateCStates:GenerateCStates=Yes
+GeneratePStates:GeneratePStates=Yes
Index: branches/blackosx/package/BootOptions/General.txt
===================================================================
--- branches/blackosx/package/BootOptions/General.txt (revision 0)
+++ branches/blackosx/package/BootOptions/General.txt (revision 1578)
@@ -0,0 +1,10 @@
+arch:arch=i386
+EHCIacquire:EHCIacquire=Yes
+EthernetBuiltIn:EthernetBuiltIn=Yes
+ForceHPET:ForceHPET=Yes
+ForceWake:ForceWake=Yes
+RestartFix:RestartFix=No
+UHCIreset:UHCIreset=Yes
+UseMemDetect:UseMemDetect=No
+UseKernelCache:UseKernelCache=Yes
+Wake:Wake=Yes
Index: branches/blackosx/package/BootOptions/KernelFlags.txt
===================================================================
--- branches/blackosx/package/BootOptions/KernelFlags.txt (revision 0)
+++ branches/blackosx/package/BootOptions/KernelFlags.txt (revision 1578)
@@ -0,0 +1 @@
+Npci:KF npci=0x2000
Index: branches/blackosx/package/BootOptions/Control.txt
===================================================================
--- branches/blackosx/package/BootOptions/Control.txt (revision 0)
+++ branches/blackosx/package/BootOptions/Control.txt (revision 1578)
@@ -0,0 +1,7 @@
+BootBanner:Boot Banner=No
+GUI:GUI=No
+LegacyLogo:Legacy Logo=Yes
+InstantMenu:Instant Menu=Yes
+QuietBoot:QuietBoot=Yes
+ShowInfo:ShowInfo=No
+Wait:Wait=Yes
Index: branches/blackosx/package/Resources/en.lproj/Localizable.strings
===================================================================
--- branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1577)
+++ branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1578)
@@ -1,5 +1,5 @@
ÿþ/ / G e n e r a l
- " C h a m e l e o n _ t i t l e " = " C h a m e l e o n B o o t l o a d e r " ;
+ " C h a m e l e o n _ t i t l e " = " B o o t l o a d e r & M o d u l e s " ;
" C h a m e l e o n _ d e s c r i p t i o n " = " C h a m e l e o n r e q u i r e s t h r e e e s s e n t i a l f i l e s . ( i n s i m p l e t e r m s )
b o o t 0 ( O n t h e d r i v e ' s M B R ) r e s p o n s i b l e f o r l o a d i n g b o o t 1 .
b o o t 1 ( O n t h e p a r t i t i o n ' s b o o t - s e c t o r ) t o f i n d i n g b o o t 2 .
@@ -56,6 +56,7 @@
" K e y l a y o u t _ t i t l e " = " K e y l a y o u t " ;
" K e y l a y o u t _ d e s c r i p t i o n " = " T h i s m o d u l e p e r m i t s t h e u s e r t o d e f i n e t h e k e y b o a r d k e y m a p p i n g s . " ;
+
/ / U t i l i t y
" U t i l i t y _ t i t l e " = " U t i l i t i e s " ;
" U t i l i t y _ d e s c r i p t i o n " = " O p t i o n a l f i l e s t o h e l p s e t u p " ;
@@ -69,85 +70,50 @@
" D o c u m e n t a t i o n _ t i t l e " = " D o c u m e n t a t i o n " ;
" D o c u m e n t a t i o n _ d e s c r i p t i o n " = " D o c u m e n t a t i o n f o r C h a m e l e o n m a n u a l i n s t a l l a n d u s e " ;
- / / O p t i o n s
+ / / B o o t O p t i o n s
" O p t i o n s _ t i t l e " = " B o o t O p t i o n s " ;
" O p t i o n s _ d e s c r i p t i o n " = " C r e a t e a n / E x t r a / o r g . c h a m e l e o n . B o o t . p l i s t a n d s e l e c t y o u r d e s i r e d o p t i o n s t o c o n t r o l C h a m e l e o n ' s s e t t i n g s . " ;
- " a r c h _ t i t l e " = " a r c h = i 3 8 6 " ;
- " a r c h _ d e s c r i p t i o n " = " B o o t s t h e k e r n e l i n 3 2 b i t m o d e r a t h e r t h a n t h e d e f a u l t 6 4 b i t m o d e . " ;
- " I n s t a n t M e n u _ t i t l e " = " I n s t a n t M e n u = Y e s " ;
- " I n s t a n t M e n u _ d e s c r i p t i o n " = " D i s p l a y t h e p a r t i t i o n s e l e c t i o n s c r e e n w i t h o u t s h o w i n g t h e t i m e o u t s c r e e n . " ;
+ / / C o n t r o l
+ " C o n t r o l _ t i t l e " = " C o n t r o l O p t i o n s " ;
+ " C o n t r o l _ d e s c r i p t i o n " = " S e t t i n g s t o c o n t r o l t h e w a y C h a m e l e o n w o r k s . " ;
- " Q u i e t B o o t _ t i t l e " = " Q u i e t B o o t = Y e s " ;
- " Q u i e t B o o t _ d e s c r i p t i o n " = " E n a b l e q u i e t b o o t m o d e ( n o m e s s a g e s o r p r o m p t ) . " ;
-
- " R e s t a r t F i x _ t i t l e " = " R e s t a r t F i x = N o " ;
- " R e s t a r t F i x _ d e s c r i p t i o n " = " D i s a b l e s t h e a u t o m a t i c a l l y e n a b l e d r e s t a r t f i x . " ;
-
- " S h o w I n f o _ t i t l e " = " S h o w I n f o = N o " ;
- " S h o w I n f o _ d e s c r i p t i o n " = " D i s a b l e s d i s p l a y o f p a r t i t i o n a n d r e s o l u t i o n d e t a i l s . " ;
-
- " D r o p S S D T _ t i t l e " = " D r o p S S D T = Y e s " ;
- " D r o p S S D T _ d e s c r i p t i o n " = " D i s c a r d t h e m o t h e r b o a r d ' s b u i l t - i n S S D T t a b l e s . " ;
-
- " E t h e r n e t B u i l t I n _ t i t l e " = " E t h e r n e t B u i l t I n = Y e s " ;
- " E t h e r n e t B u i l t I n _ d e s c r i p t i o n " = " E n a b l e s t h e o p t i o n o f a d d i n g ' b u i l t - i n ' t o y o u r e t h e r n e t d e v i c e s . " ;
-
- " G r a p h i c s E n a b l e r _ t i t l e " = " G r a p h i c s E n a b l e r = Y e s " ;
- " G r a p h i c s E n a b l e r _ d e s c r i p t i o n " = " E n a b l e s t h e o p t i o n t o a u t o d e t e c t N V I D I A b a s e d G P U s a n d i n j e c t t h e c o r r e c t i n f o . " ;
-
- " E n a b l e C 2 S t a t e _ t i t l e " = " E n a b l e C 2 S t a t e = Y e s " ;
- " E n a b l e C 2 S t a t e _ d e s c r i p t i o n " = " E n a b l e s p e c i f i c P r o c e s s o r p o w e r s t a t e , C 2 . " ;
-
- " E n a b l e C 3 S t a t e _ t i t l e " = " E n a b l e C 3 S t a t e = Y e s " ;
- " E n a b l e C 3 S t a t e _ d e s c r i p t i o n " = " E n a b l e s p e c i f i c P r o c e s s o r p o w e r s t a t e , C 3 . " ;
-
- " E n a b l e C 4 S t a t e _ t i t l e " = " E n a b l e C 4 S t a t e = Y e s " ;
- " E n a b l e C 4 S t a t e _ d e s c r i p t i o n " = " E n a b l e s p e c i f i c P r o c e s s o r p o w e r s t a t e , C 4 . " ;
-
- / / A d v a n c e d
- " A d v a n c e d _ t i t l e " = " A d v a n c e d " ;
- " A d v a n c e d _ d e s c r i p t i o n " = " S e l e c t y o u r a d v a n c e d d e s i r e d o p t i o n s t o c o n t r o l C h a m e l e o n ' s s e t t i n g s . " ;
-
- " N p c i _ t i t l e " = " n p c i = 0 x 2 0 0 0 " ;
- " N p c i _ d e s c r i p t i o n " = " S e t t h e f l a g n p c i = 0 x 2 0 0 0 f o r t h e K e r n e l F l a g s " ;
-
" B o o t B a n n e r _ t i t l e " = " B o o t B a n n e r = N o " ;
" B o o t B a n n e r _ d e s c r i p t i o n " = " H i d e s C h a m e l e o n ' s b o o t b a n n e r i n G U I . " ;
+ " G U I _ t i t l e " = " G U I = N o " ;
+ " G U I _ d e s c r i p t i o n " = " D i s a b l e s t h e d e f a u l t e n a b l e d g r a p h i c u s e r i n t e r f a c e . " ;
+
" L e g a c y L o g o _ t i t l e " = " L e g a c y L o g o = Y e s " ;
" L e g a c y L o g o _ d e s c r i p t i o n " = " U s e t h e l e g a c y ( g r e y o n w h i t e ) a p p l e l o g o o n t h e b o o t s c r e e n r a t h e r t h a n t h e b o o t . p n g i n t h e t h e m e . " ;
- " S M B I O S d e f a u l t s _ t i t l e " = " S M B I O S d e f a u l t s = Y e s " ;
- " S M B I O S d e f a u l t s _ d e s c r i p t i o n " = " E n a b l e s S M B I O S d e f a u l t s o p t i o n s . " ;
+ " I n s t a n t M e n u _ t i t l e " = " I n s t a n t M e n u = Y e s " ;
+ " I n s t a n t M e n u _ d e s c r i p t i o n " = " D i s p l a y t h e p a r t i t i o n s e l e c t i o n s c r e e n w i t h o u t s h o w i n g t h e t i m e o u t s c r e e n . " ;
- " U s e A t i R O M _ t i t l e " = " U s e A t i R O M = Y e s " ;
- " U s e A t i R O M _ d e s c r i p t i o n " = " E n a b l e s U s e A t i R O M o p t i o n s . " ;
+ " Q u i e t B o o t _ t i t l e " = " Q u i e t B o o t = Y e s " ;
+ " Q u i e t B o o t _ d e s c r i p t i o n " = " E n a b l e q u i e t b o o t m o d e ( n o m e s s a g e s o r p r o m p t ) . " ;
- " U s e N v i d i a R O M _ t i t l e " = " U s e N v i d i a R O M = Y e s " ;
- " U s e N v i d i a R O M _ d e s c r i p t i o n " = " E n a b l e s U s e N v i d i a R O M o p t i o n s . " ;
+ " S h o w I n f o _ t i t l e " = " S h o w I n f o = N o " ;
+ " S h o w I n f o _ d e s c r i p t i o n " = " D i s a b l e s d i s p l a y o f p a r t i t i o n a n d r e s o l u t i o n d e t a i l s . " ;
" W a i t _ t i t l e " = " W a i t = Y e s " ;
" W a i t _ d e s c r i p t i o n " = " P a u s e s t h e b o o t p r o c e s s a f t e r C h a m e l e o n h a s f i n i s h e d i t ' s s e t u p t h e n w a i t s f o r a k e y p r e s s b e f o r e i t s t a r t s t h e m a c h k e r n e l . U s e f u l w h e n c o m b i n e d w i t h v e r b o s e b o o t f o r t r o u b l e s h o o t i n g . " ;
- " W a k e _ t i t l e " = " W a k e = Y e s " ;
- " W a k e _ d e s c r i p t i o n " = " A t t e m p t s t o l o a d t h e s l e e p i m a g e s a v e d f r o m l a s t h i b e r n a t i o n . " ;
- " G U I _ t i t l e " = " G U I = N o " ;
- " G U I _ d e s c r i p t i o n " = " D i s a b l e s t h e d e f a u l t e n a b l e d g r a p h i c u s e r i n t e r f a c e . " ;
- " V B I O S _ t i t l e " = " V B I O S = Y e s " ;
- " V B I O S _ d e s c r i p t i o n " = " E n a b l e s V B I O S o p t i o n " ;
+ / / G e n e r a l
+ " G e n e r a l _ t i t l e " = " G e n e r a l O p t i o n s " ;
+ " G e n e r a l _ d e s c r i p t i o n " = " C h o o s e f r o m a s e l e c t i o n o f b a s e o p t i o n s . " ;
- " G e n e r a t e C S t a t e s _ t i t l e " = " G e n e r a t e C - S t a t e s = Y e s " ;
- " G e n e r a t e C S t a t e s _ d e s c r i p t i o n " = " E n a b l e a u t o g e n e r a t i o n o f p r o c e s s o r i d l e s l e e p s t a t e s ( C - S t a t e s ) . " ;
+ " a r c h _ t i t l e " = " a r c h = i 3 8 6 " ;
+ " a r c h _ d e s c r i p t i o n " = " B o o t s t h e k e r n e l i n 3 2 b i t m o d e r a t h e r t h a n t h e d e f a u l t 6 4 b i t m o d e . " ;
- " G e n e r a t e P S t a t e s _ t i t l e " = " G e n e r a t e P - S t a t e s = Y e s " ;
- " G e n e r a t e P S t a t e s _ d e s c r i p t i o n " = " E n a b l e a u t o g e n e r a t i o n o f p r o c e s s o r p o w e r p e r f o r m a n c e s t a t e s ( P - S t a t e s ) . " ;
+ " E H C I a c q u i r e _ t i t l e " = " E H C I a c q u i r e = Y e s " ;
+ " E H C I a c q u i r e _ d e s c r i p t i o n " = " E n a b l e s t h e o p t i o n t o f i x a n y E H C I o w n e r s h i p i s s u e s d u e t o b a d b i o s e s . " ;
- " C S T U s i n g S y s t e m I O _ t i t l e " = " N e w - G e n e r a t e C - S t a t e s = Y e s " ;
- " C S T U s i n g S y s t e m I O _ d e s c r i p t i o n " = " N e w C - S t a t e _ C S T g e n e r a t i o n m e t h o d u s i n g S y s t e m I O r e g i s t e r s i n s t e a d o f F i x e d H W . " ;
+ " E t h e r n e t B u i l t I n _ t i t l e " = " E t h e r n e t B u i l t I n = Y e s " ;
+ " E t h e r n e t B u i l t I n _ d e s c r i p t i o n " = " E n a b l e s t h e o p t i o n o f a d d i n g ' b u i l t - i n ' t o y o u r e t h e r n e t d e v i c e s . " ;
" F o r c e H P E T _ t i t l e " = " F o r c e H P E T = Y e s " ;
" F o r c e H P E T _ d e s c r i p t i o n " = " E n a b l e s H P E T o n i n t e l c h i p s e t s , f o r b i o s e s t h a t d o n t i n c l u d e t h e o p t i o n . " ;
@@ -155,8 +121,8 @@
" F o r c e W a k e _ t i t l e " = " F o r c e W a k e = Y e s " ;
" F o r c e W a k e _ d e s c r i p t i o n " = " T h i s o p t i o n e n a b l e s y o u t o b y p a s s b a d s l e e p i m a g e s . " ;
- " E H C I a c q u i r e _ t i t l e " = " E H C I a c q u i r e = Y e s " ;
- " E H C I a c q u i r e _ d e s c r i p t i o n " = " E n a b l e s t h e o p t i o n t o f i x a n y E H C I o w n e r s h i p i s s u e s d u e t o b a d b i o s e s . " ;
+ " R e s t a r t F i x _ t i t l e " = " R e s t a r t F i x = N o " ;
+ " R e s t a r t F i x _ d e s c r i p t i o n " = " D i s a b l e s t h e a u t o m a t i c a l l y e n a b l e d r e s t a r t f i x . " ;
" U H C I r e s e t _ t i t l e " = " U H C I r e s e t = Y e s " ;
" U H C I r e s e t _ d e s c r i p t i o n " = " E n a b l e s t h e o p t i o n t o r e s e t U H C I c o n t r o l l e r s b e f o r e s t a r t i n g O S X . " ;
@@ -167,28 +133,44 @@
" U s e K e r n e l C a c h e _ t i t l e " = " U s e K e r n e l C a c h e = Y e s " ;
" U s e K e r n e l C a c h e _ d e s c r i p t i o n " = " F o r L i o n o n l y . E n a b l e s l o a d i n g o f t h e p r e - l i n k e d k e r n e l . T h i s w i l l i g n o r e / E / E a n d / S / L / E . O N L Y u s e t h i s i s y o u h a v e k n o w i t c o n t a i n s e v e r y t h i n g y o u n e e d . " ;
- / / K e y L a y o u t
- " K e y L a y o u t _ t i t l e " = " K e y L a y o u t " ;
- " K e y L a y o u t _ d e s c r i p t i o n " = " S e t k e y l a y o u t t o u s e " ;
+ " W a k e _ t i t l e " = " W a k e = Y e s " ;
+ " W a k e _ d e s c r i p t i o n " = " A t t e m p t s t o l o a d t h e s l e e p i m a g e s a v e d f r o m l a s t h i b e r n a t i o n . " ;
- " m a c - d e _ t i t l e " = " G e r m a n M a c K e y b o a r d " ;
- " m a c - d e _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a G e r m a n M a c k e y b o a r d " ;
- " m a c - e s _ t i t l e " = " S p a n i s h M a c K e y b o a r d " ;
- " m a c - e s _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a S p a n i s h M a c k e y b o a r d " ;
+ / / K e r n e l F l a g s
+ " K e r n e l F l a g s _ t i t l e " = " K e r n e l F l a g s " ;
+ " K e r n e l F l a g s _ d e s c r i p t i o n " = " C h o o s e f r o m a s e l e c t i o n o f k e r n e l f l a g s . " ;
- " m a c - f r _ t i t l e " = " F r e n c h M a c K e y b o a r d " ;
- " m a c - f r _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a F r e n c h M a c k e y b o a r d " ;
+ " N p c i _ t i t l e " = " n p c i = 0 x 2 0 0 0 " ;
+ " N p c i _ d e s c r i p t i o n " = " S e t t h e f l a g n p c i = 0 x 2 0 0 0 f o r t h e K e r n e l F l a g s " ;
- " m a c - i t _ t i t l e " = " I t a l i a n M a c K e y b o a r d " ;
- " m a c - i t _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a n I t a l i a n M a c k e y b o a r d " ;
- " m a c - s e _ t i t l e " = " S w e d i s h M a c K e y b o a r d " ;
- " m a c - s e _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a S w e d i s h M a c k e y b o a r d " ;
+ / / P o w e r M a n a g e m e n t
+ " P o w e r M a n a g e m e n t _ t i t l e " = " P o w e r M a n a g e m e n t " ;
+ " P o w e r M a n a g e m e n t _ d e s c r i p t i o n " = " A s e l e c t i o n o f o p t i o n s t h a t d e a l w i t h p o w e r m a n a g e m e n t a n d s p e e d s t e p . " ;
- " p c - f r _ t i t l e " = " F r e n c h P C K e y b o a r d " ;
- " p c - f r _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a F r e n c h P C k e y b o a r d " ;
+ " C S T U s i n g S y s t e m I O _ t i t l e " = " G e n e r a t e C - S t a t e s = Y e s " ;
+ " C S T U s i n g S y s t e m I O _ d e s c r i p t i o n " = " N e w C - S t a t e _ C S T g e n e r a t i o n m e t h o d u s i n g S y s t e m I O r e g i s t e r s i n s t e a d o f F i x e d H W . " ;
+ " D r o p S S D T _ t i t l e " = " D r o p S S D T = Y e s " ;
+ " D r o p S S D T _ d e s c r i p t i o n " = " D i s c a r d t h e m o t h e r b o a r d ' s b u i l t - i n S S D T t a b l e s . " ;
+
+ " E n a b l e C 2 S t a t e _ t i t l e " = " E n a b l e C 2 S t a t e = Y e s " ;
+ " E n a b l e C 2 S t a t e _ d e s c r i p t i o n " = " E n a b l e s p e c i f i c P r o c e s s o r p o w e r s t a t e , C 2 . " ;
+
+ " E n a b l e C 3 S t a t e _ t i t l e " = " E n a b l e C 3 S t a t e = Y e s " ;
+ " E n a b l e C 3 S t a t e _ d e s c r i p t i o n " = " E n a b l e s p e c i f i c P r o c e s s o r p o w e r s t a t e , C 3 . " ;
+
+ " E n a b l e C 4 S t a t e _ t i t l e " = " E n a b l e C 4 S t a t e = Y e s " ;
+ " E n a b l e C 4 S t a t e _ d e s c r i p t i o n " = " E n a b l e s p e c i f i c P r o c e s s o r p o w e r s t a t e , C 4 . " ;
+
+ " G e n e r a t e C S t a t e s _ t i t l e " = " G e n e r a t e C - S t a t e s = Y e s " ;
+ " G e n e r a t e C S t a t e s _ d e s c r i p t i o n " = " E n a b l e a u t o g e n e r a t i o n o f p r o c e s s o r i d l e s l e e p s t a t e s ( C - S t a t e s ) . " ;
+
+ " G e n e r a t e P S t a t e s _ t i t l e " = " G e n e r a t e P - S t a t e s = Y e s " ;
+ " G e n e r a t e P S t a t e s _ d e s c r i p t i o n " = " E n a b l e a u t o g e n e r a t i o n o f p r o c e s s o r p o w e r p e r f o r m a n c e s t a t e s ( P - S t a t e s ) . " ;
+
+
/ / R e s o l u t i o n
" R e s o l u t i o n _ t i t l e " = " R e s o l u t i o n " ;
" R e s o l u t i o n _ d e s c r i p t i o n " = " S e t t h e s c r e e n r e s o l u t i o n o f y o u r d i s p l a y " ;
@@ -226,6 +208,47 @@
" 1 9 2 0 x 1 2 0 0 x 3 2 _ t i t l e " = " 1 9 2 0 x 1 2 0 0 x 3 2 " ;
" 1 9 2 0 x 1 2 0 0 x 3 2 _ d e s c r i p t i o n " = " 1 9 2 0 x 1 2 0 0 x 3 2 " ;
+
+ / / V i d e o
+ " V i d e o _ t i t l e " = " V i d e o " ;
+ " V i d e o _ d e s c r i p t i o n " = " A s e l e c t i o n o f o p t i o n s t h a t d e a l w i t h v i d e o . " ;
+
+ " G r a p h i c s E n a b l e r _ t i t l e " = " G r a p h i c s E n a b l e r = Y e s " ;
+ " G r a p h i c s E n a b l e r _ d e s c r i p t i o n " = " E n a b l e s t h e o p t i o n t o a u t o d e t e c t N V I D I A b a s e d G P U s a n d i n j e c t t h e c o r r e c t i n f o . " ;
+
+ " U s e A t i R O M _ t i t l e " = " U s e A t i R O M = Y e s " ;
+ " U s e A t i R O M _ d e s c r i p t i o n " = " E n a b l e s U s e A t i R O M o p t i o n s . " ;
+
+ " U s e N v i d i a R O M _ t i t l e " = " U s e N v i d i a R O M = Y e s " ;
+ " U s e N v i d i a R O M _ d e s c r i p t i o n " = " E n a b l e s U s e N v i d i a R O M o p t i o n s . " ;
+
+ " V B I O S _ t i t l e " = " V B I O S = Y e s " ;
+ " V B I O S _ d e s c r i p t i o n " = " E n a b l e s V B I O S o p t i o n " ;
+
+
+ / / K e y L a y o u t
+ " K e y L a y o u t _ t i t l e " = " K e y L a y o u t " ;
+ " K e y L a y o u t _ d e s c r i p t i o n " = " S e t k e y l a y o u t t o u s e " ;
+
+ " m a c - d e _ t i t l e " = " G e r m a n M a c K e y b o a r d " ;
+ " m a c - d e _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a G e r m a n M a c k e y b o a r d " ;
+
+ " m a c - e s _ t i t l e " = " S p a n i s h M a c K e y b o a r d " ;
+ " m a c - e s _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a S p a n i s h M a c k e y b o a r d " ;
+
+ " m a c - f r _ t i t l e " = " F r e n c h M a c K e y b o a r d " ;
+ " m a c - f r _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a F r e n c h M a c k e y b o a r d " ;
+
+ " m a c - i t _ t i t l e " = " I t a l i a n M a c K e y b o a r d " ;
+ " m a c - i t _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a n I t a l i a n M a c k e y b o a r d " ;
+
+ " m a c - s e _ t i t l e " = " S w e d i s h M a c K e y b o a r d " ;
+ " m a c - s e _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a S w e d i s h M a c k e y b o a r d " ;
+
+ " p c - f r _ t i t l e " = " F r e n c h P C K e y b o a r d " ;
+ " p c - f r _ d e s c r i p t i o n " = " U s e t h e k e y b o a r d l a y o u t f o r a F r e n c h P C k e y b o a r d " ;
+
+
/ / T h e m e s
" T h e m e s _ t i t l e " = " T h e m e s " ;
" T h e m e s _ d e s c r i p t i o n " = " A c o l l e c t i o n o f s a m p l e t h e m e s
Index: branches/blackosx/package/buildpkg.sh
===================================================================
--- branches/blackosx/package/buildpkg.sh (revision 1577)
+++ branches/blackosx/package/buildpkg.sh (revision 1578)
@@ -183,23 +183,57 @@
# build Extras package
# build options packages
- echo "================= Options ================="
+
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
choices[$((choicescount++))]="\n\n"
((xmlindent++))
- # build base options packages
- packagesidentity="org.chameleon.options"
- options=($( find "${pkgroot}/Scripts/BaseOptions" -type d -depth 1 -not -name '.svn' ))
- for (( i = 0 ; i < ${#options[@]} ; i++ ))
+ # ------------------------------------------------------
+ # parse BootOptions folder to find files of boot options.
+ # ------------------------------------------------------
+ bootOptionsFolder="${pkgroot}/BootOptions"
+ bootOptionFiles=($( find "${bootOptionsFolder}" -depth 1 -not -name '.svn' ))
+
+ for (( i = 0 ; i < ${#bootOptionFiles[@]} ; i++ ))
+ do
+
+ # Take filename and Strip .txt from end and path from front
+ builtOptionsFolderName=$( echo ${bootOptionFiles[$i]%.txt} )
+ builtOptionsFolderName=$( echo ${builtOptionsFolderName##*/} )
+ echo "================= $builtOptionsFolderName ================="
+
+ outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
+ choices[$((choicescount++))]="\n\n"
+ ((xmlindent++))
+ packagesidentity="org.chameleon.options.$builtOptionsFolderName"
+
+ # ------------------------------------------------------
+ # Read boot option file. for example, Resolutions.txt.
+ # Each line in the file is a boot option to add.
+ # Structure of boot option in file is name:key=value
+ # ------------------------------------------------------
+ while read textLine
do
- mkdir -p "${1}/${options[$i]##*/}/Root"
- cp "${options[$i]}"/* "${1}/${options[$i]##*/}/Root"
- echo " [BUILD] ${options[$i]##*/} "
- buildpackage "${1}/${options[$i]##*/}" "/$chamTemp/options" "" "start_selected=\"false\"" >/dev/null 2>&1
- done
- # End build base options packages
+ # split line - taking all before ':' as option name
+ # and all after ':' as key/value
+ optionName=${textLine%:*}
+ keyValue=${textLine##*:}
+ # create folders required for each boot option
+ mkdir -p "${1}/$optionName/Root/"
+
+ # create dummy file with name of key/value
+ echo "" > "${1}/$optionName/Root/${keyValue}"
+
+ echo " [BUILD] ${optionName} "
+ buildpackage "${1}/${optionName}" "/$chamTemp/options" "" "start_selected=\"false\"" >/dev/null 2>&1
+
+ done < ${bootOptionFiles[$i]}
+
+ ((xmlindent--))
+ outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
+ done
+
# build KeyLayout options packages
echo "================= Keymaps Options ================="
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
@@ -216,47 +250,12 @@
done
((xmlindent--))
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
- # End build base options packages
- # build resolution packages
- echo "================= Res. Options ================="
- outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
- choices[$((choicescount++))]="\n\n"
- ((xmlindent++))
- packagesidentity="org.chameleon.options.resolution"
- resolutions=($( find "${pkgroot}/Scripts/Resolutions" -type d -depth 1 -not -name '.svn' ))
- for (( i = 0 ; i < ${#resolutions[@]} ; i++ ))
- do
- mkdir -p "${1}/${resolutions[$i]##*/}/Root/"
- cp "${resolutions[$i]}"/* "${1}/${resolutions[$i]##*/}/Root"
- echo " [BUILD] ${resolutions[$i]##*/} "
- buildpackage "${1}/${resolutions[$i]##*/}" "/$chamTemp/options" "" "start_selected=\"false\"" >/dev/null 2>&1
- done
- ((xmlindent--))
- outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
- # End build resolution packages
+ # End build KeyLayout options packages
- # build Advanced packages
- echo "================= Adv. Options ================="
- outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
- choices[$((choicescount++))]="\n\n"
- ((xmlindent++))
-
- packagesidentity="org.chameleon.options.advanced"
- optionsadv=($( find "${pkgroot}/Scripts/Advanced" -type d -depth 1 -not -name '.svn' ))
- for (( i = 0 ; i < ${#optionsadv[@]} ; i++ ))
- do
- mkdir -p "${1}/${optionsadv[$i]##*/}/Root"
- cp "${optionsadv[$i]}"/* "${1}/${optionsadv[$i]##*/}/Root"
- echo " [BUILD] ${optionsadv[$i]##*/} "
- buildpackage "${1}/${optionsadv[$i]##*/}" "/$chamTemp/options" "" "start_selected=\"false\"" >/dev/null 2>&1
- done
- ((xmlindent--))
- outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
- # End build Advanced packages
-
((xmlindent--))
outline[$((outlinecount++))]="${indent[$xmlindent]}\t"
+
# End build options packages
# build theme packages
@@ -298,7 +297,7 @@
# clean up
- rm -R -f "${1}"
+ #rm -R -f "${1}"
}
@@ -339,7 +338,7 @@
header+="auth=\"root\">\n"
header+="\t\n"
- rm -R -f "${1}/Temp"
+ #rm -R -f "${1}/Temp"
[ -d "${1}/Temp" ] || mkdir -m 777 "${1}/Temp"
[ -d "${1}/Root" ] && mkbom "${1}/Root" "${1}/Temp/Bom"
@@ -376,7 +375,7 @@
fi
choices[$((choicescount++))]="\n\t#${packagename// /}.pkg\n\n"
- rm -R -f "${1}"
+ #rm -R -f "${1}"
fi
}