Menu
▾
▴
vectorlinux-devel — Vector Linux developer's list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(40) |
Apr
(76) |
May
(31) |
Jun
(39) |
Jul
(44) |
Aug
(87) |
Sep
(32) |
Oct
(23) |
Nov
(36) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(49) |
Sep
(14) |
Oct
|
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(63) |
Aug
(95) |
Sep
(39) |
Oct
(61) |
Nov
(75) |
Dec
(118) |
| 2009 |
Jan
(25) |
Feb
(37) |
Mar
(20) |
Apr
(15) |
May
(14) |
Jun
(48) |
Jul
(82) |
Aug
(160) |
Sep
(94) |
Oct
(55) |
Nov
(59) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(17) |
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <cod...@go...> - 2008-08-07 19:42:05
|
Author: M0...@gm...
Date: Thu Aug 7 12:41:31 2008
New Revision: 107
Modified:
branches/iVL/.project
branches/iVL/MdlLiloOsList.module
Log:
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Aug 7 12:41:31 2008
@@ -1,6 +1,6 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmLilo
Version=0.0.33
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Aug 7 12:41:31 2008
@@ -73,12 +73,21 @@
ELSE
FrmLilo.TabStrip1[i].text = sLiloDesc
END IF
+
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "OSIntro"
+ WITH tl
+ .text = "Operating system resides in " & arrLinux[i]
+ .Move(4, 4, MdlObjSizer.get_object_width(.text) + 4, 27)
+ END WITH
+
+
+
cbInclude = NEW CheckBox(FrmLilo.TabStrip1) AS "IncludeOS"
WITH cbInclude
.text = "Include this operating system in the boot menu"
.Height = 27
.Value = TRUE
- .Move(4, 4, MdlObjSizer.get_object_width(.text) + 24)
+ .Move(4, tl.top + tl.Height + 4,
MdlObjSizer.get_object_width(.text) + 24)
END WITH
|
|
From: <cod...@go...> - 2008-08-07 19:30:50
|
Author: M0...@gm...
Date: Thu Aug 7 12:26:53 2008
New Revision: 106
Modified:
branches/iVL/.project
branches/iVL/installer.gambas
Log:
- Fixing BUG where gparted is not propperly embedding
- Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Aug 7 12:26:53 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.32
+Version=0.0.33
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-08-07 19:26:45
|
Author: M0...@gm...
Date: Thu Aug 7 12:26:22 2008
New Revision: 105
Modified:
branches/iVL/.project
branches/iVL/MdlDiskPart.module
branches/iVL/MdlLiloOsList.module
branches/iVL/installer.gambas
Log:
- Fixing BUG where gparted is not propperly embedding
- Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Aug 7 12:26:22 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.31
+Version=0.0.32
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Thu Aug 7 12:26:22 2008
@@ -75,7 +75,7 @@
'ENDIF
'TRY embEmbedder.Embed(iHandle)
- IF aHandle <> 0 THEN
+ IF iHandle <> ""
TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
IF ERROR THEN Message.Warning(Error.Text)
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Aug 7 12:26:22 2008
@@ -68,8 +68,11 @@
IF Exist("/tmp/lilo_tmp/boot/vmlinuz") = TRUE THEN
sLiloDesc = ME.ID_DISTRO("/tmp/lilo_tmp")
FrmLilo.TabStrip1.Count = i + 1
+ IF sLiloDesc <> "Linux" THEN
FrmLilo.TabStrip1[i].text = sLiloDesc & " Linux"
-
+ ELSE
+ FrmLilo.TabStrip1[i].text = sLiloDesc
+ END IF
cbInclude = NEW CheckBox(FrmLilo.TabStrip1) AS "IncludeOS"
WITH cbInclude
.text = "Include this operating system in the boot menu"
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-08-07 19:18:39
|
Author: M0...@gm...
Date: Thu Aug 7 12:16:01 2008
New Revision: 104
Modified:
branches/iVL/.project
branches/iVL/MdlDiskPart.module
branches/iVL/installer.gambas
Log:
- Fixing BUG where gparted is not propperly embedding
- Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Aug 7 12:16:01 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.30
+Version=0.0.31
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -16,7 +16,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/root/svn-installer2/installer.gambas
Maintainer=benoit
Vendor=Princeton
Address=benoit@localhost
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Thu Aug 7 12:16:01 2008
@@ -59,7 +59,7 @@
END IF
IF aHandle.Count = 0 THEN
aHandle = Desktop.Find(sTitle2) ' gparted cannot find drives, but it
loaded ;)
- END IF
+ 'END IF
IF aHandle.Count = 0 THEN
Message("Setup is unable to successfully run gparted on this
system. This may be a sign of \n" &
@@ -75,10 +75,11 @@
'ENDIF
'TRY embEmbedder.Embed(iHandle)
+ IF aHandle <> 0 THEN
TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
IF ERROR THEN Message.Warning(Error.Text)
-
+ END IF
END
PUBLIC FUNCTION FIND_DOS_PARTITIONS(sDev AS String) AS Boolean
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-08-07 19:14:37
|
Author: M0...@gm...
Date: Thu Aug 7 12:13:54 2008
New Revision: 103
Modified:
branches/iVL/.project
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlDiskPart.module
branches/iVL/MdlLiloOsList.module
Log:
- Fixing BUG where gparted is not propperly embedding
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Aug 7 12:13:54 2008
@@ -1,6 +1,6 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
-Startup=FrmLilo
+Startup=MdlCore
Version=0.0.30
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Thu Aug 7 12:13:54 2008
@@ -15,6 +15,8 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+PUBLIC sVidMode AS String
+PUBLIC sLiloTrgt AS String
PUBLIC SUB Form_Open()
@@ -22,9 +24,10 @@
' FMain.tvPlan["Conf0"].Selected = TRUE
' FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
' FMain.tvPlan["Inst2"].Picture = MdlCore.sDonePic
-
+ ME.sVidMode = "Standard"
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
MdlLiloOsList.LIST_LILO_OS_CHOICES()
+
END
PUBLIC SUB YNLiloBox_Click()
@@ -60,8 +63,9 @@
.LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width +
2, .tlTarGet.top, .tlBanner.Width - (.tlTarGet.Width + .tlTarGet.left))
.tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height + 8,
MdlObjSizer.get_object_width(.tlFbMode.Text) + 8)
.FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
2, .tlFbMode.top, .tlBanner.Width - (.tlFbMode.Width + .tlFbMode.Left))
- .tlBanner2.Move(.tlFbMode.left, .FBResolution.top
+ .FBResolution.Height + 16, MdlObjSizer.get_object_width(.tlBanner2.Text)
+ 36)
- .LiloAppendBox.Move(.tlBanner2.left, .tlBanner2.top
+ .tlBanner2.Height + 4, .ClientWidth - (.LiloAppendBox.x) * 2)
+ .TabStrip1.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height *
5)
+ '.tlBanner2.Move(.tlFbMode.left, .FBResolution.top
+ .FBResolution.Height + 16, MdlObjSizer.get_object_width(.tlBanner2.Text)
+ 36)
+ '.LiloAppendBox.Move(.tlBanner2.left, .tlBanner2.top
+ .tlBanner2.Height + 4, .ClientWidth - (.LiloAppendBox.x) * 2)
END WITH
END
@@ -70,5 +74,13 @@
MdlLiloOsList.LIST_LILO_OS_CHOICES
'ME.Hide
'FrmLiloOsList.Show
+
+END
+
+PUBLIC SUB FBResolution_Click()
+
+ ME.sVidMode = Trim(ME.FBResolution.Text)
+ MdlLiloOsList.LIST_LILO_OS_CHOICES()
+
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Thu Aug 7 12:13:54 2008
@@ -23,14 +23,6 @@
ReadOnly = True
List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
}
- { LiloAppendBox TextBox
- MoveScaled(1,26,57,3)
- Text = ("")
- }
- { tlBanner2 TextLabel
- MoveScaled(1,20,58,3)
- Text = ("Lilo optional parameters: You may add any lilo boot options
here. ")
- }
{ tlTarGet TextLabel
MoveScaled(1,10,10,3.125)
Text = ("Target")
@@ -44,7 +36,7 @@
Text = ("Button1")
}
{ TabStrip1 TabStrip
- MoveScaled(1,26,61,32)
+ MoveScaled(1,20,61,32)
Index = 0
Text = ("Tab 0")
Index = 0
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Thu Aug 7 12:13:54 2008
@@ -20,7 +20,7 @@
DIM sTitle AS String
- DIM sTitle1 AS String
+ DIM sTitle1, sTitle2 AS String
DIM aHandle AS NEW Pointer[]
DIM iHandle AS Integer
DIM i AS Integer = 0
@@ -39,27 +39,28 @@
sTitle = "/dev/hda - GParted"
sTitle1 = "/dev/sda - GParted"
-
+ sTitle2 = "GParted"
'aHandle = Desktop.Find(sTitle)
aHandle = Desktop.Find(sTitle)
- IF aHandle = "" THEN
- aHandle = Desktop.Find(sTitle1)
- END IF
-
- IF Left(sTitle, 2) = "0x" THEN
- iHandle = Val("&" & Mid$(sTitle, 3))
- ELSE IF Left(sTitle) = "&" THEN
- iHandle = Val(sTitle)
- ELSE
+ ' ' ' IF aHandle = "" THEN
+ ' ' ' aHandle = Desktop.Find(sTitle1)
+ ' ' ' END IF
+ ' ' '
+ ' ' ' IF Left(sTitle, 2) = "0x" THEN
+ ' ' ' iHandle = Val("&" & Mid$(sTitle, 3))
+ ' ' ' ELSE IF Left(sTitle) = "&" THEN
+ ' ' ' iHandle = Val(sTitle)
+ ' ' ' ELSE
'Message.Info(aHandle[0])
+
+ IF aHandle.Count = 0 THEN
+ aHandle = Desktop.Find(sTitle1)
+ END IF
IF aHandle.Count = 0 THEN
- REPEAT
- WAIT 2
- aHandle = Desktop.Find(sTitle)
- INC i
- UNTIL
- i = 10 OR aHandle.Count > 0
+ aHandle = Desktop.Find(sTitle2) ' gparted cannot find drives, but it
loaded ;)
+ END IF
+
IF aHandle.Count = 0 THEN
Message("Setup is unable to successfully run gparted on this
system. This may be a sign of \n" &
"a bad install media. Setup cannot continue.")
@@ -71,7 +72,7 @@
ENDIF
iHandle = aHandle[0]
- ENDIF
+ 'ENDIF
'TRY embEmbedder.Embed(iHandle)
TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Aug 7 12:13:54 2008
@@ -38,6 +38,8 @@
x = 4
y = 4
+ FrmLilo.TabStrip1.Count = 1
+
cbarr = NEW Object[]
SHELL "fdisk -l | grep -E \'^/dev/.* \\* .*(FAT16)\' | cut -f 1 -d \'
\'" TO sFatList
sFatList = Trim(sFatList)
@@ -102,8 +104,15 @@
END WITH
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
WITH txtAppnd
+
.Move(tl.Left + tl.Width + 8, tl.top, tl.Width)
+ IF FrmLilo.sVidMode <> "Standard" THEN
+ .Enabled = TRUE
.text = "splash=silent"
+ ELSE
+ .Enabled = FALSE
+ .Text = "not available"
+ END IF
.Height = 27
END WITH
|
|
From: <cod...@go...> - 2008-08-07 18:23:36
|
Author: M0...@gm...
Date: Thu Aug 7 10:40:01 2008
New Revision: 102
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLiloOsList.module
Log:
- Added the swap line to the current fstab to enable swap while installing
- Trying new lilo OS choices model
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/ClsGlobal.class
+# /home/moises/area-51/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/ClsPartSel.class
+# /home/moises/area-51/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/ClsWinDrives.class
+# /home/moises/area-51/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmDiskPart.class
+# /home/moises/area-51/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmLicense.class
+# /home/moises/area-51/projects/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmPartScheme.class
+# /home/moises/area-51/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmPartSel.class
+# /home/moises/area-51/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmPkgSel.class
+# /home/moises/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmSelISO.class
+# /home/moises/area-51/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmSummary.class
+# /home/moises/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmWinDrives.class
+# /home/moises/area-51/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlDiskPart.module
+# /home/moises/area-51/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlObjSizer.module
+# /home/moises/area-51/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlPkgSel.module
+# /home/moises/area-51/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlSummarize.module
+# /home/moises/area-51/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlWinDrives.module
+# /home/moises/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Thu Aug 7 10:40:01 2008
@@ -24,7 +24,7 @@
' FMain.tvPlan["Inst2"].Picture = MdlCore.sDonePic
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
-
+MdlLiloOsList.LIST_LILO_OS_CHOICES()
END
PUBLIC SUB YNLiloBox_Click()
@@ -67,8 +67,8 @@
END
PUBLIC SUB Button1_Click()
-
- ME.Hide
- FrmLiloOsList.Show
+MdlLiloOsList.LIST_LILO_OS_CHOICES
+ 'ME.Hide
+ 'FrmLiloOsList.Show
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Thu Aug 7 10:40:01 2008
@@ -1,14 +1,14 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,63,41)
+ MoveScaled(0,0,64,61)
Text = ("")
{ tlBanner TextLabel
MoveScaled(0,0,58,4.5)
Text = ("Configure and install lilo (Linux Boot Loader)")
}
{ LiloTarget ComboBox
- MoveScaled(13,10,39,3.1667)
+ MoveScaled(13,10,39,3.125)
Text = ("")
ReadOnly = True
List = []
@@ -18,29 +18,35 @@
Text = ("Don't Install Lilo")
}
{ FBResolution ComboBox
- MoveScaled(20,15,32,3.1667)
+ MoveScaled(20,15,32,3.125)
Text = ("")
ReadOnly = True
List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
}
{ LiloAppendBox TextBox
- MoveScaled(1,27,45,3)
+ MoveScaled(1,26,57,3)
Text = ("")
}
{ tlBanner2 TextLabel
- MoveScaled(1,21,58,3)
+ MoveScaled(1,20,58,3)
Text = ("Lilo optional parameters: You may add any lilo boot options
here. ")
}
{ tlTarGet TextLabel
- MoveScaled(1,10,10,3.1667)
+ MoveScaled(1,10,10,3.125)
Text = ("Target")
}
{ tlFbMode TextLabel
- MoveScaled(1,15,18,3.1667)
+ MoveScaled(1,15,18,3.125)
Text = ("Video Resolution")
}
{ Button1 Button
- MoveScaled(47,34,7,2)
+ MoveScaled(55,57,7,2)
Text = ("Button1")
+ }
+ { TabStrip1 TabStrip
+ MoveScaled(1,26,61,32)
+ Index = 0
+ Text = ("Tab 0")
+ Index = 0
}
}
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Aug 7 10:40:01 2008
@@ -166,6 +166,9 @@
"# Swap partitions\n" &
"# The 'sw' option means auto activating with 'swapon -a'.\n"
IF ClsPartSel.sSwap THEN
+ ' take a second here to throw the swap line to the current running system
+ SHELL "echo \'" & ClsPartSel.sSwap & Space(5) & "none" & Space(5)
& "swap" & Space(5) & "sw" & Space(5) & "0" & Space(5) & "0" & "\' >>
/etc/fstab" WAIT
+ 'write the same line to the future fstab
sFstab = sFstab & gb.NewLine &
ClsPartSel.sSwap & Space(5) & "none" & Space(5) & "swap" & Space(5)
& "sw" & Space(5) & "0" & Space(5) & "0"
END IF
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Aug 7 10:40:01 2008
@@ -31,6 +31,10 @@
DIM svmLinuz AS String
DIM cbLiloItem AS CheckBox
DIM x, y AS Integer
+ DIM ibtX AS Integer
+ DIM txtAppnd AS TextBox
+ DIM cbInclude AS CheckBox
+ DIM tl AS TextLabel
x = 4
y = 4
@@ -61,23 +65,74 @@
' now check for a vmlinuz
IF Exist("/tmp/lilo_tmp/boot/vmlinuz") = TRUE THEN
sLiloDesc = ME.ID_DISTRO("/tmp/lilo_tmp")
- cbLiloItem = NEW CheckBox(FrmLiloOsList.scrlOsList) AS "OsList"
- WITH cbLiloItem
- .x = x
- .y = y
- IF sLiloDesc <> "Linux" THEN
- .Text = sLiloDesc & Space(1) & "Linux" & Space(1) & "on"
& Space(1) & arrLinux[i]
- ELSE
- .Text = sLiloDesc
- END IF
- .tag = arrLinux[i]
- .Height = 27
- .Width = MdlObjSizer.get_object_width(.text) + 36 ' allow
room for the checkbox
- .Value = TRUE
-
- END WITH
- cbarr.Add(cbLiloItem)
- y = y + cbLiloItem.Height + 4
+ FrmLilo.TabStrip1.Count = i + 1
+ FrmLilo.TabStrip1[i].text = sLiloDesc & " Linux"
+
+ cbInclude = NEW CheckBox(FrmLilo.TabStrip1) AS "IncludeOS"
+ WITH cbInclude
+ .text = "Include this operating system in the boot menu"
+ .Height = 27
+ .Value = TRUE
+ .Move(4, 4, MdlObjSizer.get_object_width(.text) + 24)
+ END WITH
+
+
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "Label"
+ WITH tl
+ .text = "Name"
+ .Move(cbInclude.left, cbInclude.top + cbInclude.Height +
4, MdlObjSizer.get_object_width(.text))
+ .Height = 27
+ .Alignment = Align.Normal
+ .BackColor = Color.Default
+ END WITH
+ txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "NameBox"
+ WITH txtAppnd
+ .Width = tl.Width * 4
+ .text = sLiloDesc
+ .Height = tl.Height
+ .x = tl.left + tl.Width + 8
+ .y = tl.Top
+ END WITH
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "AppndLbl"
+ WITH tl
+ .text = "Kernel boot options"
+ .Move(4, txtAppnd.top + txtAppnd.Height + 4,
MdlObjSizer.get_object_width(.text))
+ .Height = 27
+ .Alignment = Align.Normal
+ END WITH
+ txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
+ WITH txtAppnd
+ .Move(tl.Left + tl.Width + 8, tl.top, tl.Width)
+ .text = "splash=silent"
+ .Height = 27
+ END WITH
+
+
+ ' ' '
+ ' ' ' 'Message.Info(FrmLilo.TabStrip1.Count)
+ ' ' ' FrmLilo.TabStrip1[FrmLilo.TabStrip1.Count].text =
sLiloDesc
+ ' ' ' RETURN
+ ' ' ' cbLiloItem = NEW CheckBox(FrmLiloOsList.scrlOsList)
AS "OsList"
+ ' ' '
+ ' ' '
+ ' ' ' WITH cbLiloItem
+ ' ' ' .x = x
+ ' ' ' .y = y
+ ' ' ' IF sLiloDesc <> "Linux" THEN
+ ' ' ' .Text = sLiloDesc & Space(1) & "Linux" & Space(1)
& "on" & Space(1) & arrLinux[i]
+ ' ' ' ELSE
+ ' ' ' .Text = sLiloDesc
+ ' ' ' END IF
+ ' ' '
+ ' ' ' .tag = arrLinux[i]
+ ' ' ' .Height = 27
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 36 '
allow room for the checkbox
+ ' ' ' .Value = TRUE
+ ' ' '
+ ' ' ' END WITH
+ ' ' '
+ ' ' ' cbarr.Add(cbLiloItem)
+ ' ' ' y = y + cbLiloItem.Height + 4
END IF
@@ -90,14 +145,8 @@
END
PUBLIC SUB OsList_click()
- DIM iH AS Integer = 28
- DIM box AS CheckBox
-
-
-
-
-
-
+
+
END
|
|
From: <cod...@go...> - 2008-08-07 17:53:25
|
Author: M0...@gm...
Date: Wed Aug 6 10:16:24 2008
New Revision: 100
Modified:
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/MdlSetup.module
Log:
Trying credits scroll
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Wed Aug 6 10:16:24 2008
@@ -91,12 +91,20 @@
PUBLIC SUB tmCredits_Timer()
+
+ DIM X AS Integer
+ X = ME.sclCredits.ScrollX
- DEC ME.sclCredits.x
-
+ INC ME.sclCredits.ScrollX
+ IF X = ME.sclCredits.Scrollx THEN
+ ME.sclCredits.scrollx = 0
+ END IF
+
- IF ME.sclCredits.x < - ME.tlCredits.Width + ME.tlCredits.x THEN
- ME.sclCredits.x = ME.sclCredits.Width
- ENDIF
+
+ '
+ ' IF ME.sclCredits.ScrollX < - ME.tlCredits.Width + ME.tlCredits.x THEN
+ ' ME.sclCredits.Scrollx = ME.sclCredits.Width
+ ' ENDIF
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Wed Aug 6 10:16:24 2008
@@ -11,7 +11,7 @@
MoveScaled(1,10,76,34)
Text = ("")
{ tlCurrPkg TextLabel
- MoveScaled(2,1,73,3.3333)
+ MoveScaled(2,1,73,3.1667)
Text = ("Installing ...")
}
{ pbInstallProg ProgressBar
@@ -19,10 +19,10 @@
Label = False
}
{ pbInstallProg2 ProgressBar
- MoveScaled(1,19,44,3.3333)
+ MoveScaled(1,19,44,3.1667)
}
{ tlCurrPkg2 TextLabel
- MoveScaled(1,15,45,3.3333)
+ MoveScaled(1,15,45,3.1667)
Text = ("Total progress")
}
{ tlCurrStepLbl TextLabel
@@ -34,16 +34,17 @@
MoveScaled(2,47,81,13)
Text = ("VectorLinux ... Brought to you by ")
{ sclCredits ScrollView
- MoveScaled(2,3,77,8)
+ MoveScaled(2,3,77,7)
+ ScrollBar = Scroll.None
{ tlCredits TextLabel
MoveScaled(1,1,53,4)
- Text = ("TextLabel1")
+ Text = ("")
}
}
}
{ tmCredits #Timer
#X = 480
#Y = 120
- Delay = 300
+ Delay = 30
}
}
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Wed Aug 6 10:16:24 2008
@@ -211,10 +211,10 @@
DIM i AS Integer
FOR i = 0 TO sFile.count - 1
- tlOutput.Text = tlOutput.Text & Space(1) & Trim(sFile[i])
+ tlOutput.Text = tlOutput.Text & Space(3) & Trim(sFile[i])
NEXT
tlOutput.Width = MdlObjSizer.get_object_width(tlOutput.Text) + 24
- tlOutput.Border = Border.Plain
+ 'tlOutput.Border = Border.Plain
|
|
From: <cod...@go...> - 2008-08-07 17:49:04
|
Author: M0...@gm...
Date: Wed Aug 6 15:01:46 2008
New Revision: 101
Modified:
branches/iVL/.project
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmLiloOsList.form
branches/iVL/MdlSetup.module
Log:
- Implemented scrolling credits text
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Aug 6 15:01:46 2008
@@ -1,6 +1,6 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
-Startup=FrmInstallSys
+Startup=FrmLilo
Version=0.0.30
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Wed Aug 6 15:01:46 2008
@@ -34,6 +34,7 @@
PUBLIC SUB Form_Open()
+
' prepare the system
'ME.HIDE_PROGRES_CONTROLS()
@@ -44,7 +45,10 @@
'ME.BEGIN_PROCESS()
MdlSetup.RUN_CREDITS("/mnt/loop/CREDIT", ME.tlCredits)
+
ME.tmCredits.Enabled = TRUE
+
+
END
PUBLIC SUB Form_Show()
@@ -67,6 +71,9 @@
.pbInstallProg.Move(.tlCurrStepLbl.left +
(.tlCurrStepLbl.Width), .tlCurrStepLbl.top, .FrmProg.Width -
(.tlCurrStepLbl.Width + (.tlcurrsteplbl.left * 2)))
.tlCurrPkg2.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height * 2.5), .FrmProg.Width - (.tlCurrPkg.Left * 2))
.pbInstallProg2.Move(.tlCurrPkg2.Left, .tlCurrPkg2.top +
(.tlCurrPkg2.Height + 2), .tlCurrPkg2.Width, 27)
+ .frmCredits.Move(.FrmProg.left, .FrmProg.top + .FrmProg.Height +
16, .FrmProg.Width)
+ .sclCredits.Move(8, 24, .frmCredits.Width - (.sclCredits.left * 2))
+ .tlCredits.Move(8, 4)
'.pbInstallProg.Move(.tlCurrStepLbl.Left + (.tlCurrStepLbl.Width +
2), .FrmProg.Width - (.tlCurrStepLbl.Width + (.tlCurrStepLbl.left * 2))) '
'.pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 2), .tlCurrPkg.Width)
@@ -92,12 +99,21 @@
PUBLIC SUB tmCredits_Timer()
+ ' ' DIM i AS Integer = ME.FrmProg.left + 20
+ ' '
+ ' ' IF ME.tlCredits.x < (i) - (ME.tlCredits.Width) THEN ME.tlCredits.x =
(frmCredits.Width - 12)
+ ' ' tlCredits.x = frmCredits.left + 4 + (tlCredits.x - 10)
+ ' '
+
+
+
DIM X AS Integer
X = ME.sclCredits.ScrollX
INC ME.sclCredits.ScrollX
IF X = ME.sclCredits.Scrollx THEN
ME.sclCredits.scrollx = 0
+ ME.tmCredits.Enabled = FALSE
END IF
@@ -106,5 +122,17 @@
' IF ME.sclCredits.ScrollX < - ME.tlCredits.Width + ME.tlCredits.x THEN
' ME.sclCredits.Scrollx = ME.sclCredits.Width
' ENDIF
+
+END
+
+PUBLIC SUB sclCredits_MouseDown()
+
+
+
+END
+
+PUBLIC SUB tlCredits_MouseDown()
+
+
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Wed Aug 6 15:01:46 2008
@@ -11,7 +11,7 @@
MoveScaled(1,10,76,34)
Text = ("")
{ tlCurrPkg TextLabel
- MoveScaled(2,1,73,3.1667)
+ MoveScaled(2,1,73,3.125)
Text = ("Installing ...")
}
{ pbInstallProg ProgressBar
@@ -19,10 +19,10 @@
Label = False
}
{ pbInstallProg2 ProgressBar
- MoveScaled(1,19,44,3.1667)
+ MoveScaled(1,19,44,3.125)
}
{ tlCurrPkg2 TextLabel
- MoveScaled(1,15,45,3.1667)
+ MoveScaled(1,15,45,3.125)
Text = ("Total progress")
}
{ tlCurrStepLbl TextLabel
@@ -31,14 +31,16 @@
}
}
{ frmCredits Frame
- MoveScaled(2,47,81,13)
+ MoveScaled(2,47,81,8)
Text = ("VectorLinux ... Brought to you by ")
{ sclCredits ScrollView
- MoveScaled(2,3,77,7)
+ MoveScaled(1,1,58,5)
+ Border = False
ScrollBar = Scroll.None
{ tlCredits TextLabel
- MoveScaled(1,1,53,4)
+ MoveScaled(0,0,53,4)
Text = ("")
+ Alignment = Align.Normal
}
}
}
Modified: branches/iVL/FrmLiloOsList.form
==============================================================================
--- branches/iVL/FrmLiloOsList.form (original)
+++ branches/iVL/FrmLiloOsList.form Wed Aug 6 15:01:46 2008
@@ -9,8 +9,11 @@
}
{ VPanel1 VPanel
MoveScaled(1,13,71,43)
- { scrlOsList ScrollView
- MoveScaled(0,0,71,40)
+ { scrlOsList ListContainer
+ MoveScaled(2,0,58,15)
+ }
+ { scrlOsListold ScrollView
+ MoveScaled(3,18,71,19)
Expand = True
}
}
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Wed Aug 6 15:01:46 2008
@@ -205,20 +205,29 @@
+
+
PUBLIC SUB RUN_CREDITS(sCreditFile AS String, tlOutput AS TextLabel)
DIM sFile AS String[] = Split(File.Load(sCreditFile), "\n")
DIM i AS Integer
FOR i = 0 TO sFile.count - 1
- tlOutput.Text = tlOutput.Text & Space(3) & Trim(sFile[i])
+ IF Left(Trim(sFile[i]), Len("M0E-lnx")) = "M0E-lnx" THEN
+ sFile[i] = "M0E-lnx [ vpackager, vasmCC, GUI installer ]"
+ ELSE IF Left(Trim(sFile[i]), Len("Uelsk8s")) = "Uelsk8s" THEN
+ sFile[i] = "Uelks8s [ vlthemeswitch, ISO Master, Gui Installer ]"
+ ELSE
+ sFile[i] = sFile[i]
+ END IF
+ tlOutput.Text = tlOutput.Text & Space(12) & " *** " & sFile[i]
+' tlOutput.Text = sFile[i]
+ 'WAIT 20
NEXT
tlOutput.Width = MdlObjSizer.get_object_width(tlOutput.Text) + 24
'tlOutput.Border = Border.Plain
-
-
-
+
END
|
|
From: <cod...@go...> - 2008-08-04 21:52:51
|
Author: M0...@gm...
Date: Mon Aug 4 14:52:27 2008
New Revision: 99
Added:
branches/iVL/FrmLiloOsList.class
branches/iVL/FrmLiloOsList.form
branches/iVL/MdlLiloOsList.module
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlCore.module
branches/iVL/MdlSetup.module
Log:
- Little more work on the Lilo setup part
- First attempt at a credits model
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Aug 4 14:52:27 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:251
+#: FMain.class:257
msgid "Process Overview"
msgstr ""
-#: FMain.class:274
+#: FMain.class:280
msgid "Next"
msgstr ""
-#: FMain.class:280
+#: FMain.class:286
msgid "Back"
msgstr ""
-#: FMain.class:286
+#: FMain.class:292
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Mon Aug 4 14:52:27 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlCore.module
+# /home/moises/area-51/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Mon Aug 4 14:52:27 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlSetup.module
+# /home/moises/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Aug 4 14:52:27 2008
@@ -1,6 +1,6 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmInstallSys
Version=0.0.30
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Aug 4 14:52:27 2008
@@ -171,8 +171,7 @@
IF ClsPkgSel.bCustom = TRUE THEN
'get the list of selected bulks only
- 'MdlPkgSel.GET_USER_BULK_SELECTION()
- 'Message("Going for a custom install")
+
MdlPkgSel.GET_USER_BULK_SELECTION()
frmNext = FrmPkgsel2
ELSE
@@ -191,7 +190,14 @@
CASE "FrmSummary"
' frmNext = FrmHostPrep ' prepare host
frmNext = FrmInstallSys
-
+
+ 'POST INSTALL CONFIGURATION
+ CASE "FrmInstallSys"
+ frmNext = FrmLilo
+
+ CASE "FrmLilo"
+ frmNext = FrmLiloOsList
+
END SELECT
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Mon Aug 4 14:52:27 2008
@@ -35,15 +35,16 @@
PUBLIC SUB Form_Open()
' prepare the system
- ME.HIDE_PROGRES_CONTROLS()
+ 'ME.HIDE_PROGRES_CONTROLS()
ME.FrmProg.Text = " Preparing system for installation "
ME.tlCurrStepLbl.Text = "Current Step"
-ME.BEGIN_PROCESS()
-
+'ME.BEGIN_PROCESS()
+MdlSetup.RUN_CREDITS("/mnt/loop/CREDIT", ME.tlCredits)
+ME.tmCredits.Enabled = TRUE
END
PUBLIC SUB Form_Show()
@@ -88,3 +89,14 @@
+
+PUBLIC SUB tmCredits_Timer()
+
+ DEC ME.sclCredits.x
+
+
+ IF ME.sclCredits.x < - ME.tlCredits.Width + ME.tlCredits.x THEN
+ ME.sclCredits.x = ME.sclCredits.Width
+ ENDIF
+
+END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Mon Aug 4 14:52:27 2008
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,78,51)
+ MoveScaled(0,0,90,66)
Text = ("")
{ tlBanner TextLabel
MoveScaled(1,1,63,5)
@@ -11,7 +11,7 @@
MoveScaled(1,10,76,34)
Text = ("")
{ tlCurrPkg TextLabel
- MoveScaled(2,1,73,3.375)
+ MoveScaled(2,1,73,3.3333)
Text = ("Installing ...")
}
{ pbInstallProg ProgressBar
@@ -19,15 +19,31 @@
Label = False
}
{ pbInstallProg2 ProgressBar
- MoveScaled(1,19,44,3.375)
+ MoveScaled(1,19,44,3.3333)
}
{ tlCurrPkg2 TextLabel
- MoveScaled(1,15,45,3.375)
+ MoveScaled(1,15,45,3.3333)
Text = ("Total progress")
}
{ tlCurrStepLbl TextLabel
MoveScaled(2,5,11,3)
Text = ("Current Step ")
}
+ }
+ { frmCredits Frame
+ MoveScaled(2,47,81,13)
+ Text = ("VectorLinux ... Brought to you by ")
+ { sclCredits ScrollView
+ MoveScaled(2,3,77,8)
+ { tlCredits TextLabel
+ MoveScaled(1,1,53,4)
+ Text = ("TextLabel1")
+ }
+ }
+ }
+ { tmCredits #Timer
+ #X = 480
+ #Y = 120
+ Delay = 300
}
}
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Mon Aug 4 14:52:27 2008
@@ -18,6 +18,11 @@
PUBLIC SUB Form_Open()
+' FMain.FrmCurr = ME
+' FMain.tvPlan["Conf0"].Selected = TRUE
+' FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
+' FMain.tvPlan["Inst2"].Picture = MdlCore.sDonePic
+
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
END
@@ -55,6 +60,15 @@
.LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width +
2, .tlTarGet.top, .tlBanner.Width - (.tlTarGet.Width + .tlTarGet.left))
.tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height +
8, MdlObjSizer.get_object_width(.tlFbMode.Text) + 8)
.FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
2, .tlFbMode.top, .tlBanner.Width - (.tlFbMode.Width + .tlFbMode.Left))
+ .tlBanner2.Move(.tlFbMode.left, .FBResolution.top
+ .FBResolution.Height + 16,
MdlObjSizer.get_object_width(.tlBanner2.Text) + 36)
+ .LiloAppendBox.Move(.tlBanner2.left, .tlBanner2.top
+ .tlBanner2.Height + 4, .ClientWidth - (.LiloAppendBox.x) * 2)
END WITH
+
+END
+
+PUBLIC SUB Button1_Click()
+
+ ME.Hide
+ FrmLiloOsList.Show
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Mon Aug 4 14:52:27 2008
@@ -8,7 +8,7 @@
Text = ("Configure and install lilo (Linux Boot Loader)")
}
{ LiloTarget ComboBox
- MoveScaled(13,10,39,3.3333)
+ MoveScaled(13,10,39,3.1667)
Text = ("")
ReadOnly = True
List = []
@@ -18,10 +18,10 @@
Text = ("Don't Install Lilo")
}
{ FBResolution ComboBox
- MoveScaled(20,15,32,3.3333)
- Text = ("No installable images found.")
+ MoveScaled(20,15,32,3.1667)
+ Text = ("")
ReadOnly = True
- List = [("Standard"), ("Bootsplash High"), ("Bootsplash Med"),
("Bootsplash Extra high")]
+ List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
}
{ LiloAppendBox TextBox
MoveScaled(1,27,45,3)
@@ -32,11 +32,15 @@
Text = ("Lilo optional parameters: You may add any lilo boot
options here. ")
}
{ tlTarGet TextLabel
- MoveScaled(1,10,10,3.3333)
+ MoveScaled(1,10,10,3.1667)
Text = ("Target")
}
{ tlFbMode TextLabel
- MoveScaled(1,15,18,3.3333)
+ MoveScaled(1,15,18,3.1667)
Text = ("Video Resolution")
+ }
+ { Button1 Button
+ MoveScaled(47,34,7,2)
+ Text = ("Button1")
}
}
Added: branches/iVL/FrmLiloOsList.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmLiloOsList.class Mon Aug 4 14:52:27 2008
@@ -0,0 +1,43 @@
+' Gambas class file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+
+
+
+PUBLIC SUB Button1_Click()
+
+ ME.Hide
+ FrmLiloOsList.Show
+
+END
+
+PUBLIC SUB Form_Open()
+
+ MdlLiloOsList.LIST_LILO_OS_CHOICES()
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+
+ .tlbanner.Move(4, 4, .ClientWidth - .tlbanner.x * 2)
+ .VPanel1.Move(4, .tlbanner.top + .tlbanner.Height +
16, .ClientWidth - .VPanel1.x * 2)
+
+ END WITH
+
+END
Added: branches/iVL/FrmLiloOsList.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmLiloOsList.form Mon Aug 4 14:52:27 2008
@@ -0,0 +1,17 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,74,59)
+ Text = ("")
+ { tlbanner TextLabel
+ MoveScaled(1,3,64,7)
+ Text = ("The following operating systems have been detected on
this computer. Please select the ones to be included in the boot menu.")
+ }
+ { VPanel1 VPanel
+ MoveScaled(1,13,71,43)
+ { scrlOsList ScrollView
+ MoveScaled(0,0,71,40)
+ Expand = True
+ }
+ }
+}
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Mon Aug 4 14:52:27 2008
@@ -481,7 +481,7 @@
.Add("Inst1", "Prepare Host", sToDopic, "Inst")
.Add("Inst2", "Install Operating System", sToDopic, "Inst")
.Add("Conf", "System Configuration", sCatPic)
- .Add("Conf0", "Computer Name", sToDopic, "Conf")
+ .Add("Conf0", "Boot Menu Options", sToDopic, "Conf")
.Add("Conf1", "System Administrator", sToDopic, "Conf")
.Add("Conf2", "Network Configuration", sToDopic, "Conf")
.Add("Conf3", "User Accounts", sToDopic, "Conf")
Added: branches/iVL/MdlLiloOsList.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlLiloOsList.module Mon Aug 4 14:52:27 2008
@@ -0,0 +1,132 @@
+' Gambas module file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PRIVATE cbarr AS Object[]
+PRIVATE sText AS String
+PUBLIC SUB LIST_LILO_OS_CHOICES()
+
+ DIM sFatList AS String
+ DIM arrFat AS String[]
+ DIM sNTFSLst AS String
+ DIM arrNTFS AS String[]
+ DIM sLinuxList AS String
+ DIM arrLinux AS String[]
+ DIM i AS Integer
+ DIM sLiloLabel AS String
+ DIM sLiloDesc AS String
+ DIM svmLinuz AS String
+ DIM cbLiloItem AS CheckBox
+ DIM x, y AS Integer
+ x = 4
+ y = 4
+
+ cbarr = NEW Object[]
+ SHELL "fdisk -l | grep -E \'^/dev/.* \\* .*(FAT16)\' | cut -f 1 -d
\' \'" TO sFatList
+ sFatList = Trim(sFatList)
+ IF sFatList <> "" THEN
+ arrFat = Split(sFatList, "\n")
+ END IF
+ SHELL "fdisk -l| grep -E \'^/dev/.* \\* .*(FAT32|HPFS|NTFS|Win)\' |
cut -f 1 -d \' \'" TO sNTFSLst
+ sNTFSLst = Trim(sNTFSLst)
+ IF sNTFSLst <> "" THEN
+ arrNTFS = Split(sNTFSLst, "\n")
+ END IF
+ SHELL "fdisk -l |grep -E \'83 *Linux\' | cut -f 1 -d \' \'" TO sLinuxList
+ 'sLinuxList = Trim(sLinuxList)
+
+ 'RETURN
+ IF sLinuxList <> "" THEN
+ arrLinux = Split(sLinuxList, "\n")
+ END IF
+
+ 'FOR TESTING PURPOSES, ONLY DO THE LINUX DRIVES
+ 'create a temporary monunt dir
+ TRY MKDIR "/tmp/lilo_tmp"
+ FOR i = 0 TO arrLinux.Count - 1
+ SHELL "mount " & arrLinux[i] & Space(1) & "/tmp/lilo_tmp" WAIT
+ ' now check for a vmlinuz
+ IF Exist("/tmp/lilo_tmp/boot/vmlinuz") = TRUE THEN
+ sLiloDesc = ME.ID_DISTRO("/tmp/lilo_tmp")
+ cbLiloItem = NEW CheckBox(FrmLiloOsList.scrlOsList) AS "OsList"
+ WITH cbLiloItem
+ .x = x
+ .y = y
+ IF sLiloDesc <> "Linux" THEN
+ .Text = sLiloDesc & Space(1) & "Linux" & Space(1)
& "on" & Space(1) & arrLinux[i]
+ ELSE
+ .Text = sLiloDesc
+ END IF
+ .tag = arrLinux[i]
+ .Height = 27
+ .Width = MdlObjSizer.get_object_width(.text) + 36 '
allow room for the checkbox
+ .Value = TRUE
+
+ END WITH
+ cbarr.Add(cbLiloItem)
+ y = y + cbLiloItem.Height + 4
+
+ END IF
+
+ SHELL "umount /tmp/lilo_tmp" WAIT
+ NEXT
+
+
+
+
+END
+
+PUBLIC SUB OsList_click()
+ DIM iH AS Integer = 28
+ DIM box AS CheckBox
+
+
+
+
+
+
+END
+
+
+PUBLIC FUNCTION ID_DISTRO(sWhereIsItMounted AS String) AS String
+
+ DIM sBasePath AS String = sWhereIsItMounted &/ "etc"
+ DIM sDesc AS String
+
+ IF Exist(sBasePath &/ "vector-version") THEN
+ sDesc = "Vector"
+ ELSE IF Exist(sBasePath &/ "sysconfig" &/ "vector") THEN
+ sDesc = "Vector"
+ ELSE IF Exist(sBasePath &/ "slackware-version") THEN
+ sDesc = "Slackware"
+ ELSE IF Exist(sBasePath &/ "Suse-release") OR Exist(sBasePath
&/ "UnitedLinux-release") THEN
+ sDesc = "SuSe"
+ ELSE IF Exist(sBasePath &/ "gentoo-release") THEN
+ sDesc = "Gentoo"
+ ELSE IF Exist(sBasePath &/ "debian_version") THEN
+ sDesc = "Debian"
+ ELSE IF Exist(sBasePath &/ "mandrake-release") THEN
+ sDesc = "Makdrake"
+ ELSE IF Exist(sBasePath &/ "redhat-release") THEN
+ sDesc = "RedHat"
+ ELSE IF Exist(sBasePath &/ "fedora-release") THEN
+ sDesc = "Fedora"
+ ELSE
+ sDesc = "Linux"
+ END IF
+ RETURN sDesc
+
+END
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Mon Aug 4 14:52:27 2008
@@ -205,5 +205,20 @@
+PUBLIC SUB RUN_CREDITS(sCreditFile AS String, tlOutput AS TextLabel)
+
+ DIM sFile AS String[] = Split(File.Load(sCreditFile), "\n")
+ DIM i AS Integer
+
+ FOR i = 0 TO sFile.count - 1
+ tlOutput.Text = tlOutput.Text & Space(1) & Trim(sFile[i])
+ NEXT
+ tlOutput.Width = MdlObjSizer.get_object_width(tlOutput.Text) + 24
+ tlOutput.Border = Border.Plain
+
+
+
+
+END
|
|
From: <cod...@go...> - 2008-08-01 15:16:01
|
Author: M0...@gm... Date: Fri Aug 1 08:15:42 2008 New Revision: 98 Added: branches/iVL/ClsLilo.class Modified: branches/iVL/.lang/#project.pot branches/iVL/FrmLilo.class branches/iVL/FrmLilo.form branches/iVL/MdlConfLilo.module branches/iVL/MdlInstallCustom.module Log: - Added option listing to lilo setup window - Added resizing and object positioning on lilo setup window - Changed the text displayed during a custom install to show a package description rather than a package name Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Fri Aug 1 08:15:42 2008 @@ -1,4 +1,4 @@ -# /root/svn-installer2/.project +# /home/moises/area-51/projects/installer/.project # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/ClsLilo.class ============================================================================== --- (empty file) +++ branches/iVL/ClsLilo.class Fri Aug 1 08:15:42 2008 @@ -0,0 +1,17 @@ +' Gambas class file + +' This file is part of vinstall-ng + +' vinstall-ng is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 2 of the License, or +' (at your option) any later version. + +' vinstall-ng is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. + +' You should have received a copy of the GNU General Public License +' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>. + Modified: branches/iVL/FrmLilo.class ============================================================================== --- branches/iVL/FrmLilo.class (original) +++ branches/iVL/FrmLilo.class Fri Aug 1 08:15:42 2008 @@ -1,3 +1,60 @@ ' Gambas class file +' This file is part of vinstall-ng +' vinstall-ng is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 2 of the License, or +' (at your option) any later version. +' vinstall-ng is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. + +' You should have received a copy of the GNU General Public License +' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>. + + + +PUBLIC SUB Form_Open() + +MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS() + +END + +PUBLIC SUB YNLiloBox_Click() + + IF ME.YNLiloBox.value = TRUE THEN + WITH ME + .LiloAppendBox.Enabled = FALSE + .LiloTarget.Enabled = FALSE + .FBResolution.Enabled = FALSE + END WITH + ELSE + WITH ME + + .LiloAppendBox.Enabled = TRUE + .LiloTarget.Enabled = TRUE + .FBResolution.Enabled = TRUE + END WITH + END IF + + + +END + +PUBLIC SUB Form_Resize() + + WITH ME + .tlTarGet.Alignment = Align.Normal + .tlFbMode.Alignment = Align.Normal + .tlBanner.Move(4, 4) + .tlBanner.Width = .ClientWidth - (.tlBanner.x * 2) + .YNLiloBox.Move(.tlBanner.left, .tlBanner.Top + (.tlBanner.Height + 1.5), MdlObjSizer.get_object_width(.YNLiloBox.text) + 36, 28) + .tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height * 1.5), MdlObjSizer.get_object_width(.tlTarGet.Text) + 8) + .LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 2, .tlTarGet.top, .tlBanner.Width - (.tlTarGet.Width + .tlTarGet.left)) + .tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height + 8, MdlObjSizer.get_object_width(.tlFbMode.Text) + 8) + .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width + 2, .tlFbMode.top, .tlBanner.Width - (.tlFbMode.Width + .tlFbMode.Left)) + END WITH + +END Modified: branches/iVL/FrmLilo.form ============================================================================== --- branches/iVL/FrmLilo.form (original) +++ branches/iVL/FrmLilo.form Fri Aug 1 08:15:42 2008 @@ -3,23 +3,22 @@ { Form Form MoveScaled(0,0,63,41) Text = ("") - FullScreen = True { tlBanner TextLabel - MoveScaled(0,0,58,4.5455) + MoveScaled(0,0,58,4.5) Text = ("Configure and install lilo (Linux Boot Loader)") } { LiloTarget ComboBox - MoveScaled(1,11,45,3.2727) + MoveScaled(13,10,39,3.3333) Text = ("") ReadOnly = True - List = [("MBR"), ("Sector"), ("Floppy")] + List = [] } { YNLiloBox CheckBox MoveScaled(1,5,18,3) Text = ("Don't Install Lilo") } { FBResolution ComboBox - MoveScaled(1,18,45,3.2727) + MoveScaled(20,15,32,3.3333) Text = ("No installable images found.") ReadOnly = True List = [("Standard"), ("Bootsplash High"), ("Bootsplash Med"), ("Bootsplash Extra high")] @@ -29,7 +28,15 @@ Text = ("") } { tlBanner2 TextLabel - MoveScaled(1,23,58,3) + MoveScaled(1,21,58,3) Text = ("Lilo optional parameters: You may add any lilo boot options here. ") + } + { tlTarGet TextLabel + MoveScaled(1,10,10,3.3333) + Text = ("Target") + } + { tlFbMode TextLabel + MoveScaled(1,15,18,3.3333) + Text = ("Video Resolution") } } Modified: branches/iVL/MdlConfLilo.module ============================================================================== --- branches/iVL/MdlConfLilo.module (original) +++ branches/iVL/MdlConfLilo.module Fri Aug 1 08:15:42 2008 @@ -18,7 +18,38 @@ ' PUBLIC Vmlinuz AS Object[] -' + +PUBLIC SUB DISPLAY_LILO_TARGET_OPTIONS() + + DIM sList AS String + DIM sListarr AS String[] + DIM i AS Integer + DIM sTarget AS String + + SHELL "probedisk | grep disk |cut -f 1 -d \\|" TO sList + sList = Trim(sList) + sListarr = Split(sList, "\n") + FOR i = 0 TO sListarr.count - 1 + sTarget = "MBR of " & Trim(sListarr[i]) + FrmLilo.LiloTarget.Add(sTarget) + NEXT + + WITH FrmLilo.LiloTarget + IF LCase(ClsPartSel.fRoot) <> "xfs" THEN + .Add("Sector") + END IF + + .Add("Floppy") + END WITH + + +END + + + + + + ' PUBLIC SUB LIST_BULK_SELECTION() ' ' DIM cb AS CheckBox Modified: branches/iVL/MdlInstallCustom.module ============================================================================== --- branches/iVL/MdlInstallCustom.module (original) +++ branches/iVL/MdlInstallCustom.module Fri Aug 1 08:15:42 2008 @@ -344,8 +344,13 @@ DIM vSize AS Variant DIM vTargetSize AS Variant + DIM sDesc AS String SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | grep " & File.Name(sBulkPath) & " | cut -f 2 -d :" TO vSize + SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | grep " & File.Name(sBulkPath) & " | cut -f 3 -d :" TO sDesc + IF Right(sDesc) = "\'" THEN + sDesc = Left(sDesc, RInStr(sDesc, "\'") - 1) + END IF vSize = Trim(CStr(vSize)) sDump = "" sErr = "" @@ -364,6 +369,7 @@ REPEAT WAIT 1 ' do the progress updating here + FrmInstallSys.tlCurrPkg.Text = Trim(sDesc) IF vSize <> "" THEN MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize)) END IF |
|
From: <cod...@go...> - 2008-08-01 13:14:07
|
Author: M0...@gm...
Date: Fri Aug 1 06:13:59 2008
New Revision: 97
Modified:
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/FrmLilo.class
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartSel.module
Log:
- Fixed problem in partitioning phase where the installer was shooting
out a /home partition when only a / was selected.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Fri Aug 1 06:13:59 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlPartSel.module
+# /home/moises/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Fri Aug 1 06:13:59 2008
@@ -1,2 +1,3 @@
' Gambas class file
+
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Aug 1 06:13:59 2008
@@ -173,35 +173,13 @@
sFstab = sFstab & "\n"
' Wheewww!... that's the whole fstab there... Please fix the win partitions
- 'Message(sFstab)
-
- ' IF NOT ClsGlobal.sTargetMnt OR ClsGlobal.sTargetMnt = "" THEN
- ' ClsGlobal.sTargetMnt = "/mnt/target"
- ' END IF
-
- ';Message(ClsGlobal.sTargetMnt &/ "etc")
+
' now save the file to /etc/fstab
IF Exist(ClsGlobal.sTargetMnt &/ "etc") = FALSE THEN
MKDIR ClsGlobal.sTargetMnt &/ "etc"
END IF
File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "fstab", SConv(sFstab))
- 'CATCH
- 'PRINT ERROR
- '.RETURN 1
- 'RETURN 0
- ' IF ClsPkgSel.bCustom = TRUE THEN
- ' ' perform custom install
- ' MdlInstallCustom.PERFORM_CUSTOM_INSTALL()
- ' ELSE
- ' FrmInstallSys.tlCurrPkg.Text = "Vectorlinux is now
installing ... Please wait"
- ' ME.PERFORM_FULL_INSTALL()
- 'ME.INSTALL_CONFIG_PACKAGES
- 're-direct to packages for now
- 'FrmInstallSys.tlCurrPkg.Text = "Installing Additional
software... Please wait"
- 'ME.INSTALL_REQUIRED_PACKAGES()
- 'ME.INSTALL_PACKAGES()
-
- ' END IF
+
END
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Fri Aug 1 06:13:59 2008
@@ -281,7 +281,8 @@
SELECT CASE LAST.text
CASE "/"
ClsPartSel.sRoot = LCase(LAST.tag)
-
+
+ CASE "/home"
ClsPartSel.sHome = LCase(LAST.tag)
CASE "/usr"
|
|
From: <cod...@go...> - 2008-08-01 01:26:13
|
Author: uelsk8s
Date: Thu Jul 31 18:25:06 2008
New Revision: 96
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/install-pkg
branches/iVL/installer.gambas
Log:
fixed custom install progress meters
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /root/svn-installer2/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /root/svn-installer2/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /root/svn-installer2/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# /root/svn-installer2/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /root/svn-installer2/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /root/svn-installer2/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /root/svn-installer2/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /root/svn-installer2/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /root/svn-installer2/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPkgSel.class
+# /root/svn-installer2/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /root/svn-installer2/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSummary.class
+# /root/svn-installer2/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /root/svn-installer2/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /root/svn-installer2/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /root/svn-installer2/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /root/svn-installer2/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /root/svn-installer2/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPkgSel.module
+# /root/svn-installer2/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /root/svn-installer2/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSummarize.module
+# /root/svn-installer2/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Jul 31 18:25:06 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /root/svn-installer2/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Jul 31 18:25:06 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.29
+Version=0.0.30
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -16,7 +16,7 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/home/uel/svn-installer/installer.gambas
+ExecPath=/root/svn-installer2/installer.gambas
Maintainer=benoit
Vendor=Princeton
Address=benoit@localhost
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Jul 31 18:25:06 2008
@@ -28,122 +28,120 @@
PUBLIC SUB PERFORM_CUSTOM_INSTALL()
DIM iRet AS Integer = 0
-
WITH FMain
.tvPlan["Inst2"].Selected = TRUE
.tvPlan["Inst2"].Picture = MdlCore.sNowPic
.tvPlan["Inst1"].Picture = MdlCore.sDonePic
- END WITH
-
-
+ END WITH
ME.CALCULATE_TOTAL_PACKAGES()
'RETURN
-
- WAIT 2
- iRet = ME.INSTALL_REQUIRED_BULKS()
- PRINT " INSTALLING REQUIRED BULKS"
- IF iRet <> 0 THEN
- 'exit this is an error
- Message.Error("There as been an error while installing
required system software. " & gb.newline &
- sErr)
- RETURN
- END IF
- iRet = ME.INSTALL_USER_SELECTED_BULKS()
- PRINT "INSTALING USER-SELECTED BULK PACKAGES"
- IF iRet <> 0 THEN
- Message.Error("There has been an error while installing
optional software to your system. " & gb.newline &
- sErr)
- RETURN
- END IF
- iret = ME.INSTALL_USER_SELECTED_PACKAGES()
- PRINT "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
- IF iRet <> 0 THEN
- Message.Error("There has been an error while installing
optional software to your system. " & gb.newline &
- sErr)
- RETURN
- END IF
+ WAIT 2
+ iRet = ME.INSTALL_REQUIRED_BULKS()
+ PRINT " INSTALLING REQUIRED BULKS"
+ IF iRet <> 0 THEN
+ 'exit this is an error
+ Message.Error("There as been an error while installing required
system software. " & gb.newline & sErr)
+ RETURN
+ END IF
+
+ iRet = ME.INSTALL_USER_SELECTED_BULKS()
+ PRINT "INSTALING USER-SELECTED BULK PACKAGES"
+ IF iRet <> 0 THEN
+ Message.Error("There has been an error while installing optional
software to your system. " & gb.newline & sErr)
+ RETURN
+ END IF
+
+ iret = ME.INSTALL_USER_SELECTED_PACKAGES()
+ PRINT "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
+ IF iRet <> 0 THEN
+ Message.Error("There has been an error while installing optional
software to your system. " & gb.newline & sErr)
+ RETURN
+ END IF
- iret = ME.INSTALL_PACKAGES_REQUIRED()
- PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
- IF iret <> 0 THEN
- Message.Error("Error while installing required system
software. " & gb.NewLine & sErr)
- RETURN
- END IF
- iret = ME.INSTALL_CONF_PACKAGES()
- PRINT "INSTALLING CONFIGURATION PACKAGES"
- IF iret <> 0 THEN
- Message.Error("Error while installing system configuration. "
& gb.NewLine & sErr)
- RETURN
- END IF
+ iret = ME.INSTALL_PACKAGES_REQUIRED()
+ PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
+ IF iret <> 0 THEN
+ Message.Error("Error while installing required system software. "
& gb.NewLine & sErr)
+ RETURN
+ END IF
+
+ iret = ME.INSTALL_CONF_PACKAGES()
+ PRINT "INSTALLING CONFIGURATION PACKAGES"
+ IF iret <> 0 THEN
+ Message.Error("Error while installing system configuration. " &
gb.NewLine & sErr)
+ RETURN
+ END IF
+
iret = ME.INSTALL_KERNELS()
- PRINT "INSTALLING KERNELS"
- IF iret <> 0 THEN
- Message.Error("Unable to install kernels. " & gb.NewLine & sErr)
- RETURN
- END IF
- ' write new fstab now
- MdlInstallSys.WRITE_NEW_FSTAB()
- ' Installation complete....
- Message("Vectorlinux is now installed on your system . Enjoy!")
+ PRINT "INSTALLING KERNELS"
+ IF iret <> 0 THEN
+ Message.Error("Unable to install kernels. " & gb.NewLine & sErr)
+ RETURN
+ END IF
-
+ ' write new fstab now
+ MdlInstallSys.WRITE_NEW_FSTAB()
+ ' Installation complete....
+ FrmInstallSys.pbInstallProg.Value = 1
+ FrmInstallSys.pbInstallProg2.Value = 1
+ Message("Vectorlinux is now installed on your system . Enjoy!")
+ WITH FMain
+ .btQuit.Enabled = TRUE
+ .btQuit.ForeColor = Color.Black
+ END WITH
+ 'MdlCore.unlock_gui()
END
+
PUBLIC FUNCTION INSTALL_KERNELS() AS Integer
+ ' Dont know if I should install all kernels, but for the lack of
information now, I will
+ DIM sKerNames AS String
+ DIM sKernels AS String[]
+ DIM sKenVs AS String[]
+ DIM sKernVers AS String
+ DIM sKernNo AS String
+ DIM sKrnLbl AS String
+ DIM sFoundOut AS String
+ DIM sKernName AS String
+ DIM sLabel AS String
+ DIM sKernelPath AS String
+ DIM i AS Integer
+ ClsGlobal.sSourceMnt = "/mnt/cdrom"
- ' Dont know if I should install all kernels, but for the lack of
information now, I will
-
- DIM sKerNames AS String
- DIM sKernels AS String[]
- DIM sKenVs AS String[]
- DIM sKernVers AS String
- DIM sKernNo AS String
- DIM sKrnLbl AS String
- DIM sFoundOut AS String
- DIM sKernName AS String
- DIM sLabel AS String
- DIM sKernelPath AS String
- DIM i AS Integer
- ClsGlobal.sSourceMnt = "/mnt/cdrom"
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF | grep ^ISO_KERNEL_" TO sKernames
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF | grep ^HD_KERNEL_" TO sKernVers
- sKernames = Trim(sKernames)
- sKernVers = Trim(sKernVers)
- sKernels = Split(sKernames, "\n")
- FOR i = 0 TO sKernels.Count - 1
- sKrnLbl = Trim(sKernels[i])
- 'sKernNo = Left(sKrnLbl, InStr(sKrnLbl, "="))
- sKernNo = Left(sKrnLbl, InStr(sKrnLbl, "=") - 1)
- sKernNo = Trim(sKernNo)
- sLabel = Right(sKrnLbl, Len(sKrnLbl) - InStr(sKrnLbl, "\'"))
- sLabel = Left(sLabel, RInStr(sLabel, "\'") - 1)
-
- sKernNo = Right(sKernNo) ' this is the number of the kernel
- SHELL " cat " & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF | grep ^HD_KERNEL_" & sKernNo TO sFoundOut
- sFoundOut = Trim(sFoundOut)
- sKernName = Right(sFoundOut, Len(sFoundOut) - InStr(sFoundOut, "\'"))
- sKernName = Left(sKernName,
RInStr(sKernName, "\'") - 1)
- 'Message.Info(sLabel & " - " & sKernName)
-
- ' now copy the kernel to the right place
- sKernelPath = ClsGlobal.sSourceMnt &/ "isolinux"
&/ "kernel" &/ sLabel
- IF Exist(sKernelPath) THEN
- sDump = ""
- sErr = ""
- hproc = SHELL "cp " & sKernelPath & Space(1) &
ClsGlobal.sTargetMnt &/ "boot" &/ "vmlinuz-" & sKernName FOR READ
- WAIT 3
- IF InStr(sDump, "FAILED") > 0 THEN
- RETURN 1
- ELSE
- RETURN 0
- END IF
-
- END IF
- 'SHELL "cp " & ClsGlobal.sSourceMnt &/ "isolinux"
&/ "kernel" &/
- NEXT
-
-
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^ISO_KERNEL_" TO sKernames
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^HD_KERNEL_" TO sKernVers
+ sKernames = Trim(sKernames)
+ sKernVers = Trim(sKernVers)
+ sKernels = Split(sKernames, "\n")
+ FOR i = 0 TO sKernels.Count - 1
+ sKrnLbl = Trim(sKernels[i])
+ 'sKernNo = Left(sKrnLbl, InStr(sKrnLbl, "="))
+ sKernNo = Left(sKrnLbl, InStr(sKrnLbl, "=") - 1)
+ sKernNo = Trim(sKernNo)
+ sLabel = Right(sKrnLbl, Len(sKrnLbl) - InStr(sKrnLbl, "\'"))
+ sLabel = Left(sLabel, RInStr(sLabel, "\'") - 1)
+ sKernNo = Right(sKernNo) ' this is the number of the kernel
+ SHELL " cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^HD_KERNEL_" & sKernNo TO sFoundOut
+ sFoundOut = Trim(sFoundOut)
+ sKernName = Right(sFoundOut, Len(sFoundOut) - InStr(sFoundOut, "\'"))
+ sKernName = Left(sKernName, RInStr(sKernName, "\'") - 1)
+ 'Message.Info(sLabel & " - " & sKernName)
+ 'now copy the kernel to the right place
+ sKernelPath = ClsGlobal.sSourceMnt &/ "isolinux" &/ "kernel" &/ sLabel
+ IF Exist(sKernelPath) THEN
+ sDump = ""
+ sErr = ""
+ hproc = SHELL "cp " & sKernelPath & Space(1) &
ClsGlobal.sTargetMnt &/ "boot" &/ "vmlinuz-" & sKernName FOR READ
+ WAIT 3
+ IF InStr(sDump, "FAILED") > 0 THEN
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
+ END IF
+ 'SHELL "cp " & ClsGlobal.sSourceMnt &/ "isolinux" &/ "kernel" &/
+ NEXT
END
@@ -153,172 +151,145 @@
DIM i, iret AS Integer
DIM sList, sLinearr AS String[]
-
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^CONF" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sList = Split(sOutput, "\n")
- FOR i = 0 TO sList.Count - 1
- sLine = sList[i]
- sPkg = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
- sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
- sLinearr = Split(sPkg, ":")
- sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
- ' install it now
- PRINT " + Install " & sPkgPath
- 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
- iret = ME.INSTALL_THIS_BULK(sPkgPath)
- IF iret <> 0 THEN
- RETURN iret
- END IF
- PRINT " ! " & sPkgPath & " is installed"
-
- NEXT
- ELSE ' single CONF line
- sPkg = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
- sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
- sLinearr = Split(sPkg, ":")
- sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
- 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
- iret = ME.INSTALL_THIS_BULK(sPkgPath)
- IF iret <> 0 THEN
- RETURN iret
- END IF
-
- END IF
-
-
-
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^CONF" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, "\n") > 0 THEN
+ sList = Split(sOutput, "\n")
+ FOR i = 0 TO sList.Count - 1
+ sLine = sList[i]
+ sPkg = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
+ sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
+ sLinearr = Split(sPkg, ":")
+ sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
+ ' install it now
+ PRINT " + Install " & sPkgPath
+ 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+ iret = ME.INSTALL_THIS_BULK(sPkgPath)
+ IF iret <> 0 THEN
+ RETURN iret
+ END IF
+ PRINT " ! " & sPkgPath & " is installed"
+ NEXT
+ ELSE ' single CONF line
+ sPkg = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
+ sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
+ sLinearr = Split(sPkg, ":")
+ sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
+ 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+ iret = ME.INSTALL_THIS_BULK(sPkgPath)
+ IF iret <> 0 THEN
+ RETURN iret
+ END IF
+ END IF
END
-
PUBLIC FUNCTION INSTALL_PACKAGES_REQUIRED() AS Integer
DIM i, iRet AS Integer
DIM sPkg AS String
- FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "packages" &/ "required")
- SELECT CASE File.Ext(ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg)
- CASE "tlz", "tgz"
- PRINT " + Install " & ClsGlobal.sSourceMnt
&/ "packages" &/ "required" &/ sPkg
- iret = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt
&/ "packages" &/ "required" &/ sPkg)
- IF iret <> 0 THEN
- RETURN iret
- END IF
- PRINT " ! " & ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg & " is installed"
- END SELECT
- NEXT
-
-
+ FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "packages" &/ "required")
+ SELECT CASE File.Ext(ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg)
+ CASE "tlz", "tgz"
+ PRINT " + Install " & ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg
+ iret = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt
&/ "packages" &/ "required" &/ sPkg)
+ IF iret <> 0 THEN
+ RETURN iret
+ END IF
+ PRINT " ! " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ sPkg & " is installed"
+ END SELECT
+ NEXT
END
-
PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES() AS Integer
DIM i, iret AS Integer
DIM sPkg AS String
DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "packages"
- FOR i = 0 TO ClsPkgSel.arrPkgs.count - 1
- sPkg = ClsPkgSel.arrPkgs[i]
- PRINT " + Install " & sPkgPath &/ sPkg
- iret = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
- IF iret <> 0 THEN
- RETURN iret
- END IF
- PRINT " ! " & sPkgPath &/ sPkg & " is installed"
- NEXT
-
+ FOR i = 0 TO ClsPkgSel.arrPkgs.count - 1
+ sPkg = ClsPkgSel.arrPkgs[i]
+ PRINT " + Install " & sPkgPath &/ sPkg
+ iret = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+ IF iret <> 0 THEN
+ RETURN iret
+ END IF
+ PRINT " ! " & sPkgPath &/ sPkg & " is installed"
+ NEXT
END
-
-
PUBLIC FUNCTION INSTALL_USER_SELECTED_BULKS() AS Integer
DIM SPkg AS String
DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
DIM i AS Integer
DIM iRet AS Integer
- FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
- sPkg = ClsPkgSel.arrBulks[i]
- 'install the packages now
- PRINT " + Install " & sPkgPath &/ sPkg
- 'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
- iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
- IF iRet <> 0 THEN
- RETURN 1
- END IF
- PRINT " ! " & sPkgPath &/ sPkg & " is installed"
- NEXT
-
+
+ FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
+ sPkg = ClsPkgSel.arrBulks[i]
+ 'install the packages now
+ PRINT " + Install " & sPkgPath &/ sPkg
+ 'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+ iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
+ IF iRet <> 0 THEN
+ RETURN 1
+ END IF
+ PRINT " ! " & sPkgPath &/ sPkg & " is installed"
+ NEXT
END
-
-
-
PUBLIC SUB CALCULATE_TOTAL_PACKAGES()
- DIM i AS Integer
- DIM sOutput AS String
- DIM sOutArr AS String[]
+ DIM i AS Integer
+ DIM sOutput AS String
+ DIM sOutArr AS String[]
- 'MdlPkgSel.GET_USER_BULK_SELECTION()
- 'MdlPkgSel.GET_USER_PKG_SELECTION()
- 'Message.Info(ClsPkgSel.arrBulks.Count & " from selected
bulks" & "<br>" &
- 'ClsPkgSel.arrPkgs.Count & " from selected packages")
- 'RETURN
- PRINT "Calculating package count ... Please wait"
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF" & " | grep ^BULK | grep required" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sOutArr = Split(sOutput, "\n")
- i = i + sOutArr.Count
- ELSE
- i = i + 1
- END IF
- 'Message.Info(i & " from required bulks")
- 'RETURN
-' count required packages in
- sOutArr.Clear
- sOutput = ""
- SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ "*.t?z" TO sOutput
- sOutput = Trim(sOutput)
-
- sOutArr = Split(sOutput, ",")
- i = i + sOutArr.Count
- 'Message(i & " from packages/required")
-' Count CONF packages in
- sOutArr.Clear
- sOutput = ""
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF" & " | grep ^CONF" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sOutArr = Split(sOutput, "\n")
- i = i + sOutArr.Count
- ELSE
- i = i + 1
- END IF
-' Count user-selected stuff in
+ 'MdlPkgSel.GET_USER_BULK_SELECTION()
+ 'MdlPkgSel.GET_USER_PKG_SELECTION()
+ 'Message.Info(ClsPkgSel.arrBulks.Count & " from selected bulks"
& "<br>" &
+ 'ClsPkgSel.arrPkgs.Count & " from selected packages")
+ 'RETURN
+ PRINT "Calculating package count ... Please wait"
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF"
& " | grep ^BULK | grep required" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, "\n") > 0 THEN
+ sOutArr = Split(sOutput, "\n")
+ i = i + sOutArr.Count
+ ELSE
+ i = i + 1
+ END IF
+ 'Message.Info(i & " from required bulks")
+ 'RETURN
+ 'count required packages in
+ sOutArr.Clear
+ sOutput = ""
+ SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
+ sOutput = Trim(sOutput)
+ sOutArr = Split(sOutput, ",")
+ i = i + sOutArr.Count
+ 'Message(i & " from packages/required")
+ 'Count CONF packages in
+ sOutArr.Clear
+ sOutput = ""
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF"
& " | grep ^CONF" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, "\n") > 0 THEN
+ sOutArr = Split(sOutput, "\n")
+ i = i + sOutArr.Count
+ ELSE
+ i = i + 1
+ END IF
+ 'Count user-selected stuff in
i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
iPkgCnt = i
-
PRINT "Total packages to be installed = " & i
-
-
-
-
END
-
-
-
-
-
PUBLIC FUNCTION INSTALL_REQUIRED_BULKS() AS Integer
DIM sOutput AS String
@@ -330,94 +301,81 @@
DIM sBUlkDesc AS String
DIM iRet AS Integer
-
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF"
& " | grep ^BULK | grep required" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, gb.NewLine) THEN
- sList = Split(sOutput, gb.NewLine)
- 'iPkgCnt = iPkgCnt + sList.Count ' add these to
the overall package count.
- FOR i = 0 TO sList.count - 1
- sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
- sTrimmed = Left(sTrimmed, RInStr(sTrimmed, "\'") - 1)
- ' sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
- sLine = Split(sTrimmed, ":")
- sBulk = sLine[0]
- sBUlkDesc = sLine[2]
- ' do the sizing
-
- PRINT " + install " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulk
- 'iRet =
ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk)
- iret = ME.INSTALL_THIS_BULK(ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulk)
-
- IF iRet <> 0 THEN
- ' error... stop
- PRINT "Error while installing " & sBulk & "
-> " & sBUlkDesc
- RETURN 1
-
- END IF
- PRINT " ! " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulk & " is installed"
- NEXT
- ELSE ' found only one line
- iPkgCnt = iPkgCnt + 1 ' add only one to the overall
package count
- sTrimmed = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
- sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
- sLine = Split(sTrimmed, ":")
- sBulk = sLine[0]
- sBUlkDesc = sLine[2]
- iRet = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulk)
- IF iRet <> 0 THEN
- ' error... stop
- PRINT "Error while installing " & sBulk & "
-> " & sBUlkDesc
- RETURN 1
-
- END IF
-
- END IF
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF"
& " | grep ^BULK | grep required" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, gb.NewLine) THEN
+ sList = Split(sOutput, gb.NewLine)
+ 'iPkgCnt = iPkgCnt + sList.Count ' add these to the overall
package count.
+ FOR i = 0 TO sList.count - 1
+ sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
+ sTrimmed = Left(sTrimmed, RInStr(sTrimmed, "\'") - 1)
+ 'sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
+ sLine = Split(sTrimmed, ":")
+ sBulk = sLine[0]
+ sBUlkDesc = sLine[2]
+ PRINT " + install " & ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk
+ 'iRet = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulk)
+ iret = ME.INSTALL_THIS_BULK(ClsGlobal.sSourceMnt &/ "veclinux"
&/ sBulk)
+ IF iRet <> 0 THEN
+ ' error... stop
+ PRINT "Error while installing " & sBulk & " -> " & sBUlkDesc
+ RETURN 1
+ END IF
+ PRINT " ! " & ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk & " is installed"
+ NEXT
+ ELSE ' found only one line
+ iPkgCnt = iPkgCnt + 1 ' add only one to the overall package count
+ sTrimmed = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
+ sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
+ sLine = Split(sTrimmed, ":")
+ sBulk = sLine[0]
+ sBUlkDesc = sLine[2]
+ iRet = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt &/ "veclinux"
&/ sBulk)
+ IF iRet <> 0 THEN
+ ' error... stop
+ PRINT "Error while installing " & sBulk & " -> " & sBUlkDesc
+ RETURN 1
+ END IF
+ END IF
END
-
-
PUBLIC FUNCTION INSTALL_THIS_BULK(sBulkPath AS String) AS Integer
DIM vSize AS Variant
DIM vTargetSize AS Variant
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep " & File.Name(sBulkPath) & " | cut -f 2 -d :" TO vSize
- vSize = Trim(CStr(vSize))
-
- sDump = ""
- sErr = ""
+
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep " & File.Name(sBulkPath) & " | cut -f 2 -d :" TO vSize
+ vSize = Trim(CStr(vSize))
+ sDump = ""
+ sErr = ""
+ IF vSize <> "" THEN
+ SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) && echo
$gsize | cut -f3 -d \' \'" TO vTargetSize
+ END IF
+ FrmInstallSys.pbInstallProg.Value = 0
+ INC iPkgNum
+ PRINT " Installing " & sBulkPath
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
+ FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
+ hproc = SHELL "lzmadec <" & sBulkPath & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ WAIT 1
+ REPEAT
+ WAIT 1
+ ' do the progress updating here
IF vSize <> "" THEN
- SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) &&
echo $gsize | cut -f3 -d \' \'" TO vTargetSize
+ MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
END IF
-
- INC iPkgNum
- PRINT " Installing " & sBulkPath
- MdlSetup.SHOW_PROGRESS_CONTROLS()
- FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
- hproc = SHELL "lzmadec <" & sBulkPath & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- WAIT 1
- IF hproc.State = Process.Running THEN
- WAIT 1
- REPEAT
- WAIT 1
- ' do the progress updating here
- IF vSize <> "" THEN
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
-
MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
- END IF
- UNTIL
- hproc.State = Process.Stopped
- IF InStr(sDump, "FAILED") > 0 THEN
- RETURN 1
- ELSE
- RETURN 0
- END IF
- END IF
-
-
-
-
+ UNTIL
+ hproc.State = Process.Stopped
+ IF InStr(sDump, "FAILED") > 0 THEN
+ RETURN 1
+ ELSE
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ RETURN 0
+ END IF
+ END IF
END
@@ -428,39 +386,37 @@
sDump = ""
sErr = ""
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF
| grep " & File.Name(sPackagePath) & " | cut -f 2 -d :" TO vSize
- IF vSize <> "" THEN
- SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
- END IF
-
-
- INC iPkgNum
- PRINT "Package " & iPkgNum & " of " & iPkgCnt
- MdlSetup.SHOW_PROGRESS_CONTROLS()
- FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep " & File.Name(sPackagePath) & " | cut -f 2 -d :" TO vSize
+ IF vSize <> "" THEN
+ SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) && echo
$gsize | cut -f3 -d \' \'" TO vTargetSize
+ END IF
+ FrmInstallSys.pbInstallProg.Value = 0
+ INC iPkgNum
+ PRINT "Package " & iPkgNum & " of " & iPkgCnt
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
+ FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
hproc = SHELL "install-pkg " & sPackagePath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- WAIT 1
- IF hproc.State = Process.Running THEN
- REPEAT
- WAIT 1
-
- ' do the progress bar updating here
- IF vSize <> "" THEN
-
MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- END IF
-
- UNTIL
- hproc.state = Process.Stopped
- ' now do the error checking here and return a value
-
- IF InStr(sDump, "FAILED") > 0 THEN
- 'ERROR HAS OCCURRED
- RETURN 1
- ELSE
- RETURN 0
- END IF
- END IF
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT 1
+ ' do the progress bar updating here
+ IF vSize <> "" THEN
+ MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
+ END IF
+ UNTIL
+ hproc.state = Process.Stopped
+ ' now do the error checking here and return a value
+ IF InStr(sDump, "FAILED") > 0 THEN
+ 'ERROR HAS OCCURRED
+ RETURN 1
+ ELSE
+ FrmInstallSys.pbInstallProg.Value = 1
+ WAIT
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ RETURN 0
+ END IF
+ END IF
END
@@ -470,8 +426,6 @@
READ #LAST, sLine, -256
sDump = sDump & gb.NewLine & sLine
PRINT sLine
-
-
END
PUBLIC SUB process_error(msg AS String)
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 31 18:25:06 2008
@@ -276,11 +276,15 @@
END IF
' WRITE THE FSTAB NOW
- MdlInstallSys.WRITE_NEW_FSTAB()
- FrmInstallSys.pbInstallProg.Value = 1
- FrmInstallSys.pbInstallProg2.Value = 1
+ MdlInstallSys.WRITE_NEW_FSTAB()
+ FrmInstallSys.pbInstallProg.Value = 1
+ FrmInstallSys.pbInstallProg2.Value = 1
Message.Info("Vectorlinux is now installed in your system. Please
Exit the installer")
- MdlCore.unlock_gui()
+ WITH FMain
+ .btQuit.Enabled = TRUE
+ .btQuit.ForeColor = Color.Black
+ END WITH
+ 'MdlCore.unlock_gui()
END
Modified: branches/iVL/install-pkg
==============================================================================
--- branches/iVL/install-pkg (original)
+++ branches/iVL/install-pkg Thu Jul 31 18:25:06 2008
@@ -83,8 +83,7 @@
case $packagetype in
tlz)
- lzmadec <$package | /bin/tar-1.13-pkgtools -C $ROOT -xlUpv >$TMP/$shortnam
-e 2>/dev/null
+ lzmadec <$package | /bin/tar-1.13-pkgtools -C $ROOT -xlUpv
>$TMP/$shortname 2>/dev/null
;;
tbz|tbz2)
tar $EXCLUDED -C $ROOT -xjlUpv <$package >$TMP/$shortname 2>/dev/null
@@ -113,11 +112,9 @@
fi
if [ -r $ROOT/install/slack-desc ]; then
- cat $ROOT/install/slack-desc | grep "^$packagebase:" >> $ADM_DIR/packages/$s
-hortname 2> /dev/null
+ cat $ROOT/install/slack-desc | grep "^$packagebase:" >>
$ADM_DIR/packages/$shortname 2> /dev/null
if [ "$shortname" != "$packagebase" ]; then
- cat $ROOT/install/slack-desc | grep "^$shortname:" >> $ADM_DIR/packages/$s
-hortname 2> /dev/null
+ cat $ROOT/install/slack-desc | grep "^$shortname:" >>
$ADM_DIR/packages/$shortname 2> /dev/null
fi
fi
@@ -129,8 +126,7 @@
# Some dumb bunny built a package with something other than
makepkg. Bad!
# Oh well. Bound to happen. Par for the course. Fix it and move on...
echo './' >> $ADM_DIR/packages/$shortname
- cat $TMP/$shortname | grep -v '^./$' | cut -b3- >> $ADM_DIR/packages/$shortn
-ame
+ cat $TMP/$shortname | grep -v '^./$' | cut -b3- >> $ADM_DIR/packages/$shortname
fi
if [ -f $ROOT/install/doinst.sh ]; then
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-07-31 21:59:09
|
Author: M0...@gm...
Date: Thu Jul 31 14:56:42 2008
New Revision: 95
Modified:
branches/iVL/MdlInstallCustom.module
Log:
Modified CONF install function to install CONF packages as bulks
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Jul 31 14:56:42 2008
@@ -161,12 +161,13 @@
FOR i = 0 TO sList.Count - 1
sLine = sList[i]
sPkg = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
- sPkg = Left(sPkg, Len(sPkg) - RInStr(sPkg, "\'"))
+ sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
sLinearr = Split(sPkg, ":")
sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
' install it now
PRINT " + Install " & sPkgPath
- iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+ 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+ iret = ME.INSTALL_THIS_BULK(sPkgPath)
IF iret <> 0 THEN
RETURN iret
END IF
@@ -178,7 +179,8 @@
sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
sLinearr = Split(sPkg, ":")
sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
- iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+ 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
+ iret = ME.INSTALL_THIS_BULK(sPkgPath)
IF iret <> 0 THEN
RETURN iret
END IF
|
|
From: <cod...@go...> - 2008-07-31 21:55:08
|
Author: M0...@gm...
Date: Thu Jul 31 14:54:15 2008
New Revision: 94
Modified:
branches/iVL/MdlInstallCustom.module
Log:
Small fix to the CONF package installer (bad text split line)
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Jul 31 14:54:15 2008
@@ -175,7 +175,7 @@
NEXT
ELSE ' single CONF line
sPkg = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
- sPkg = Left(sPkg, Len(sPkg) - RInStr(sPkg, "\'"))
+ sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
sLinearr = Split(sPkg, ":")
sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
|
|
From: <cod...@go...> - 2008-07-31 21:38:05
|
Author: M0...@gm...
Date: Thu Jul 31 14:37:55 2008
New Revision: 93
Modified:
branches/iVL/MdlInstallCustom.module
Log:
Fixed call in bulk package installer
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Jul 31 14:37:55 2008
@@ -393,7 +393,7 @@
PRINT " Installing " & sBulkPath
MdlSetup.SHOW_PROGRESS_CONTROLS()
FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
- hproc = SHELL "install-pkg " & sBulkPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ hproc = SHELL "lzmadec <" & sBulkPath & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
WAIT 1
IF hproc.State = Process.Running THEN
WAIT 1
|
|
From: <cod...@go...> - 2008-07-31 21:31:03
|
Author: M0...@gm...
Date: Thu Jul 31 14:29:44 2008
New Revision: 92
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlPartSel.module
Log:
- Wrote function to install bulks using lzmadec rather than install-pkg.
- Modified custom install procedure to use the new function.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/.project
+# /home/moises/area-51/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/ClsGlobal.class
+# /home/moises/area-51/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/ClsPartSel.class
+# /home/moises/area-51/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/ClsWinDrives.class
+# /home/moises/area-51/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmDiskPart.class
+# /home/moises/area-51/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmLicense.class
+# /home/moises/area-51/projects/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmPartScheme.class
+# /home/moises/area-51/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmPartSel.class
+# /home/moises/area-51/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmPkgSel.class
+# /home/moises/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmSelISO.class
+# /home/moises/area-51/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmSummary.class
+# /home/moises/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/FrmWinDrives.class
+# /home/moises/area-51/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlCore.module
+# /home/moises/area-51/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlDiskPart.module
+# /home/moises/area-51/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlObjSizer.module
+# /home/moises/area-51/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlPartSel.module
+# /home/moises/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlPkgSel.module
+# /home/moises/area-51/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlSetup.module
+# /home/moises/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlSummarize.module
+# /home/moises/area-51/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Jul 31 14:29:44 2008
@@ -1,4 +1,4 @@
-# /home/uel/svn-installer/MdlWinDrives.module
+# /home/moises/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Jul 31 14:29:44 2008
@@ -244,7 +244,8 @@
sPkg = ClsPkgSel.arrBulks[i]
'install the packages now
PRINT " + Install " & sPkgPath &/ sPkg
- iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+ 'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+ iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
IF iRet <> 0 THEN
RETURN 1
END IF
@@ -343,7 +344,8 @@
' do the sizing
PRINT " + install " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulk
- iRet =
ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk)
+ 'iRet =
ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk)
+ iret = ME.INSTALL_THIS_BULK(ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulk)
IF iRet <> 0 THEN
' error... stop
@@ -374,6 +376,49 @@
+PUBLIC FUNCTION INSTALL_THIS_BULK(sBulkPath AS String) AS Integer
+
+ DIM vSize AS Variant
+ DIM vTargetSize AS Variant
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep " & File.Name(sBulkPath) & " | cut -f 2 -d :" TO vSize
+ vSize = Trim(CStr(vSize))
+
+ sDump = ""
+ sErr = ""
+ IF vSize <> "" THEN
+ SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) &&
echo $gsize | cut -f3 -d \' \'" TO vTargetSize
+ END IF
+
+ INC iPkgNum
+ PRINT " Installing " & sBulkPath
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
+ FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
+ hproc = SHELL "install-pkg " & sBulkPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ WAIT 1
+ REPEAT
+ WAIT 1
+ ' do the progress updating here
+ IF vSize <> "" THEN
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+
MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
+ END IF
+ UNTIL
+ hproc.State = Process.Stopped
+ IF InStr(sDump, "FAILED") > 0 THEN
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
+ END IF
+
+
+
+
+END
+
+
PUBLIC FUNCTION INSTALL_THIS_PACKAGE(sPackagePath AS String) AS Integer
DIM vSize AS Variant
DIM vTargetSize AS Variant
@@ -399,7 +444,7 @@
' do the progress bar updating here
IF vSize <> "" THEN
-
MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vTargetSize))
+
MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
END IF
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Thu Jul 31 14:29:44 2008
@@ -318,115 +318,7 @@
END SELECT
-
-
- ' FOR EACH sdropdwn IN oMountPoints
- ' IF LAST.text <> "Not Used" AND LAST.text = sdropdwn.Text AND
LAST.tag <> sdropdwn.tag THEN
- ' Message.Error("You have already select a " & LAST.text & "
partition. Please " &
- ' "select only one")
- ' LAST.text = "Not Used"
- ' STOP EVENT
- ' ELSE
- '
- '
- '
- ' ' set the variable to the global class
- ' SELECT CASE Trim(LCase(LAST.text))
- ' CASE "/"
- ' ClsPartSel.sRoot = LCase(LAST.tag)
- ' CASE "/home"
- ' ClsPartSel.sHome = LCase(LAST.tag)
- ' CASE "/usr"
- ' ClsPartSel.sUsr = LCase(LAST.tag)
- ' CASE "/opt"
- ' ClsPartSel.sOpt = LCase(LAST.tag)
- ' CASE "/tmp"
- ' ClsPartSel.sTmp = LCase(LAST.tag)
- ' CASE "/var"
- ' ClsPartSel.sVar = LCase(LAST.tag)
- ' CASE "Swap"
- ' ClsPartSel.sSwap = LCase(LAST.tag)
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF Trim(sdropdwn.Tag) = LAST.tag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Swap"
- ' END IF
- ' NEXT
- '
- ' END SELECT
- ' END IF
- ' NEXT
-
- 'Message(sTag)
- '
- ' SELECT CASE sText
- ' CASE "Not Used"
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Do not format"
- ' END IF
- ' NEXT
- ' CASE "Swap"
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Swap"
- ' END IF
- ' NEXT
- ' CASE ELSE
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = TRUE
- ' END IF
- ' NEXT
- ' END SELECT
- '
- ' IF sText = "Not Used" THEN
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag LIKE sTag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Do not format"
- '
- '
- ' ELSE IF sText = "Swap" THEN
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Swap"
- ' END IF
- ' ELSE
- ' sdropdwn.Enabled = TRUE
- ' END IF
- ' NEXT
- ' 'ELSE
- '
- ' ELSE
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.Tag = sTag THEN
- ' sdropdwn.Enabled = TRUE
- ' END IF
- ' NEXT
- ' END IF
- ' IF LAST.text <> "Not Used" AND LAST.text <> "Swap" THEN
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.tag = LAST.tag THEN
- ' sdropdwn.Text = "XFS"
- ' 'Balloon.Info("Select which filesystem to use with this
partition", sdropdwn)
- ' ' Balloon("Select which filesystem to use with this partition", sdropdwn)
-
-' END IF
- ' NEXT
- ' ELSE IF LAST.text = "Swap" THEN
- ' FOR EACH sdropdwn IN oFsTypes
- ' IF sdropdwn.tag = LAST.tag THEN
- ' sdropdwn.Enabled = FALSE
- ' sdropdwn.Text = "Swap"
- ' END IF
- ' NEXT
- ' END IF
-
- 'send the value to the form public value
ME.SET_SELECTED_PARTITION(LAST.tag, LAST.text)
|
|
From: <cod...@go...> - 2008-07-31 18:31:41
|
Author: uelsk8s
Date: Thu Jul 31 11:30:52 2008
New Revision: 91
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/MdlInstallSys.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
fixing full-install progress
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/uel/svn-installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/uel/svn-installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /home/uel/svn-installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# /home/uel/svn-installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/uel/svn-installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/uel/svn-installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/uel/svn-installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/uel/svn-installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/uel/svn-installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPkgSel.class
+# /home/uel/svn-installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/uel/svn-installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSummary.class
+# /home/uel/svn-installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /home/uel/svn-installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/uel/svn-installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/uel/svn-installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /home/uel/svn-installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/uel/svn-installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPkgSel.module
+# /home/uel/svn-installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/uel/svn-installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSummarize.module
+# /home/uel/svn-installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Jul 31 11:30:52 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /home/uel/svn-installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Jul 31 11:30:52 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.28
+Version=0.0.29
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -16,6 +16,7 @@
Language=en_US
ControlPublic=1
ModulePublic=1
+ExecPath=/home/uel/svn-installer/installer.gambas
Maintainer=benoit
Vendor=Princeton
Address=benoit@localhost
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 31 11:30:52 2008
@@ -18,9 +18,8 @@
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
-
-PRIVATE iPkgCnt AS Integer
-PRIVATE iPkgNum AS Integer = 0
+ PRIVATE iPkgCnt AS Integer
+ PRIVATE iPkgNum AS Integer = 0
@@ -31,9 +30,7 @@
ClsGlobal.sTargetMnt = "/mnt/target"
IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
- END IF
-
-
+ END IF
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
'/DISABLED FOR TESTING INSTALL ONLY
@@ -75,15 +72,10 @@
MdlInstallCustom.PERFORM_CUSTOM_INSTALL
ELSE
MdlInstallSys.PERFORM_FULL_INSTALL()
- END IF
-
-
-
-
+ END IF
END
-
PUBLIC FUNCTION WRITE_NEW_FSTAB() AS Integer
DIM sEntry AS String
@@ -95,11 +87,7 @@
DIM sWinMntPnt AS String
DIM sFstab AS String
- ' make the changes show up on the steps now
-
-
-
-
+ ' make the changes show up on the steps now
FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"
sFstab = "# /etc/fstab: static file system information.\n" &
@@ -213,9 +201,10 @@
'ME.INSTALL_REQUIRED_PACKAGES()
'ME.INSTALL_PACKAGES()
- ' END IF
-
+ ' END IF
END
+
+
PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String
DIM sMntOpts AS String
@@ -233,28 +222,23 @@
sMntOpts = "defaults"
END SELECT
- RETURN sMntOpts
-
-
+ RETURN sMntOpts
END
+
PUBLIC SUB PERFORM_FULL_INSTALL()
-
-
- DIM iret AS Integer
-
+
+ DIM iret AS Integer
ClsGlobal.sTargetMnt = "/mnt/target"
- iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
- Message.Info("Total packages = " & iPkgCnt)
+
WITH FMain
.tvPlan["Inst2"].Selected = TRUE
.tvPlan["Inst2"].Picture = MdlCore.sNowPic
.tvPlan["Inst1"].Picture = MdlCore.sDonePic
- END WITH
-
-
-
+ END WITH
+ iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+ Message.Info("Total packages = " & iPkgCnt)
PRINT "Installing bulks"
MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = ME.INSTALL_BULK_PACKAGES()
@@ -293,17 +277,13 @@
' WRITE THE FSTAB NOW
MdlInstallSys.WRITE_NEW_FSTAB()
+ FrmInstallSys.pbInstallProg.Value = 1
+ FrmInstallSys.pbInstallProg2.Value = 1
Message.Info("Vectorlinux is now installed in your system. Please
Exit the installer")
-
-
-
-
+ MdlCore.unlock_gui()
END
-
-
-
PUBLIC FUNCTION INSTALL_PACKAGES_NEW() AS Integer
DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT")
@@ -313,35 +293,37 @@
DIM vPgsSize AS Variant
DIM sPkgPath AS String
DIM sPkgName AS String
- DIM vTargetSize AS Variant
-
+ DIM vTargetSize AS Variant
arrFile = Split(sFile, "\n")
FOR i = 0 TO arrFile.Count - 1
+ FrmInstallSys.pbInstallProg.Value = 0
sLine = Trim(arrFile[i])
- 'WAIT 10
IF Left(sLine, Len("PACKAGE_NAME")) = "PACKAGE NAME" THEN
sPkgName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
- 'sPkgPath = Right(arrFile[
sPkgPath = Right(Right(arrFile[i + 1], Len(arrFile[i +
1]) - InStr(arrFile[i + 1], ":")), -4)
vPgsSize = Left(Right(arrFile[i + 3], Len(arrFile[i +
3]) - InStr(arrFile[i + 3], ":")), -2)
+ FrmInstallSys.tlCurrPkg.Text = "Installing " &
sPkgName & " ..."
' now install the package
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot
& " ) && echo $gsize | cut -f3 -d \' \'" TO vTargetSize
PRINT "installing " & ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName
+ INC iPkgNum
ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName)
WAIT
IF hproc.State = Process.Running THEN
REPEAT
- WAIT 3
- ' update progree here
+ WAIT 1
+ ' update progress here
ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vPgsSize))
UNTIL
hproc.State = Process.Stopped
END IF
-
END IF
+ FrmInstallSys.pbInstallProg.Value = 1
+ WAIT
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
NEXT
- ' error check
+ 'error check
IF InStr(sDump, "FAILED") > 0 THEN
PRINT sPkgName & " failed to install "
RETURN 1
@@ -351,10 +333,6 @@
END
-
-
-
-
PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
DIM sRawList AS String
DIM sList AS String[]
@@ -368,17 +346,14 @@
DIM i AS Integer
'DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF")
DIM sLine AS String
- PRINT "inside INSTALL_BULK_PACKAGES"
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
- ' sList = Split(File.Load(Temp$("SETUP.CONF")), "\n")
-
+ ' sList = Split(File.Load(Temp$("SETUP.CONF")), "\n")
sList = Split(sRawList, "\n")
- PRINT sRawList & "srawlist " & sList.Count
+ 'PRINT sRawList & "srawlist " & sList.Count
FOR i = 0 TO sList.count - 1
- 'SHELL ". /mnt/cdrom/veclinux/SETUP.CONF && echo $BULK"
& i TO sList[i]
'sLine = Trim(sList[i])
- PRINT sList[i]
+ 'PRINT sList[i]
IF Left(sList[i], Len("BULK")) = "BULK" THEN
sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
@@ -387,11 +362,13 @@
sBulkPath = sLineArr[0]
vBulkSize = sLineArr[1]
sBulkDesc = sLineArr[2]
- PRINT sBulkPath & vBulkSize & sBulkDesc
-
+ 'PRINT sBulkPath & vBulkSize & sBulkDesc
+ FrmInstallSys.pbInstallProg.Value = 0
+ INC iPkgNum
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
- PRINT "installing " & sBulkPath
- ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
+ PRINT "installing " & sBulkPath
+ FrmInstallSys.tlCurrPkg.Text = "Installing " &
sBulkDesc & " ..."
+ 'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
hproc = SHELL "lzmadec <" & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulkPath & " | tar -xp -C " & ClsGlobal.sTargetMnt
& " || echo \'FAILED\'" FOR READ
PRINT sBulkPath
WAIT 1
@@ -401,9 +378,12 @@
ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vBulkSize))
UNTIL
hproc.State = Process.Stopped
- 'error check
- END IF
- END IF
+ 'error check
+ END IF
+ END IF
+ FrmInstallSys.pbInstallProg.Value = 1
+ WAIT
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
NEXT
'RETURN
IF InStr(sDump, "FAILED") > 0 THEN
@@ -419,24 +399,18 @@
sDump = ""
sErr = ""
- hproc = SHELL "lzmadec <" & sPath_to_bulk & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
-
-
-
+ hproc = SHELL "lzmadec <" & sPath_to_bulk & " | tar -xp -C " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
END
+
PUBLIC SUB PACKAGE_INSTALL(sPath_To_Package AS String)
sDump = ""
sErr = ""
- hproc = SHELL "install-pkg " & sPath_To_Package & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
-
-
+ hproc = SHELL "install-pkg " & sPath_To_Package & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
END
-
-
PUBLIC SUB PERFORM_FULL_INSTALL_OLD() AS Integer
'Will need to read SETUP.CONF to determine what to do here
@@ -458,8 +432,7 @@
DIM sBulkPath AS String
DIM sConfPath AS String
DIM sOptPkgPath AS String
- DIM iVal AS Float
-
+ DIM iVal AS Float
DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
WITH FrmInstallSys
@@ -473,8 +446,7 @@
.tvPlan["Inst1"].Picture = MdlCore.sDonePic
.tvPlan["Inst2"].Selected = TRUE
.tvPlan["Inst2"].Picture = MdlCore.sNowPic
- END WITH
-
+ END WITH
MdlSetup.SHOW_PROGRESS_CONTROLS()
FrmInstallSys.tlBanner.Text = "Vectorlinux is now being installed.
Please wait..."
@@ -482,7 +454,6 @@
sFile = Split(File.Load(Temp$("SETUP.CONF")), "\n")
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
-
IF Left(sLine, Len("BULK") + 1) LIKE "BULK" & "*[0-9]*" THEN
sLine = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
sLine = Left(sLine, Len(sLine) - 1)
@@ -497,14 +468,13 @@
SHELL "export gsize=$(df| grep " &
ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
'Message(CStr(sTargetSize))
sTargetSize = Trim(CStr(sTargetSize))
- sPakSize = Trim(CStr(sPakSize))
-'
+ sPakSize = Trim(CStr(sPakSize)) '
'RETURN
FrmInstallSys.tlCurrPkg.Text = "Installing " &
sPakDesc & " ..."
FrmInstallSys.pbInstallProg.Value = 0.0
- PRINT "Installing " &
sPakDesc & " Total size (KB) = " & CStr(sPakSize)
+ PRINT "Installing " & sPakDesc & " Total size (KB) = "
& CStr(sPakSize)
sDump = ""
sErr = ""
MdlCore.LOCK_GUI()
@@ -515,9 +485,7 @@
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
- UPDATE_STEP_PROGRESS(sTargetSize, sPakSize)
-
-
+ UPDATE_STEP_PROGRESS(sTargetSize, sPakSize)
UNTIL
hproc.State = Process.Stopped
' error check
@@ -527,8 +495,7 @@
sErr)
RETURN 1
ELSE
- FrmInstallSys.pbInstallProg.Value = 1
-
+ FrmInstallSys.pbInstallProg.Value = 1
END IF
PRINT sPak & " is installed... "
INC iPkgNum
@@ -541,11 +508,10 @@
' now to the packages individually
' FrmInstallSys.tlBanner.Text = "Installing additional software."
- ' ME.INSTALL_PACKAGES
-
-
+ ' ME.INSTALL_PACKAGES
END
+
PUBLIC SUB UPDATE_STEP_PROGRESS(sTargetSize AS Float, sPakSize AS Float)
DIM iMBProgress AS Float
@@ -575,12 +541,10 @@
IF iVal > FrmInstallSys.pbInstallProg.Value THEN
FrmInstallSys.pbInstallProg.Value = iVal
END IF
- 'PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize +
sPakSize) & " = " & iVal & "%"
+ PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize + sPakSize) & " = " &
iVal & "%"
END
-
-
PUBLIC FUNCTION INSTALL_PACKAGES() AS Integer
DIM i AS Integer
@@ -635,8 +599,8 @@
END IF
END IF
END IF
- INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ INC iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
END IF
NEXT
@@ -644,12 +608,11 @@
'Message.Info("Installation complete. Ready for configuration"
FrmInstallSys.tlBanner.Text = "Installation phase complete.
Ready for configuration"
FrmInstallSys.pbInstallProg.Value = 1
- MdlCore.unlock_gui()
-
- FrmInstallSys.tlBanner.Text = "Installing default system
configuration and required software."
- ME.INSTALL_REQUIRED_PACKAGES
-
+ MdlCore.unlock_gui()
+ FrmInstallSys.tlBanner.Text = "Installing default system
configuration and required software."
END
+
+
PUBLIC FUNCTION INSTALL_REQUIRED_PACKAGES() AS Integer
DIM i AS Integer
@@ -666,15 +629,11 @@
'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT"))
SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sRawFile
sFile = Split(sRawFile, "\n")
- 'SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sFile
- iTlzTotal = sFile.Count
-
+ iTlzTotal = sFile.Count
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
INC iPkgNum
-
- sTlzPath = Trim(sLine)
-
+ sTlzPath = Trim(sLine)
' now install the package with the information we already have
PRINT sTlzName & sTlzPath
'sDump = ""
@@ -700,7 +659,9 @@
hproc.State = Process.Stopped
' INC iPkgNum
END IF
- NEXT
+ NEXT
+ FrmInstallSys.pbInstallProg.Value = 1
+ WAIT 1
IF InStr(sDump, "FAILED") > 0 THEN
PRINT "Error installing packages/required"
@@ -719,8 +680,7 @@
DIM sCOnfLine AS String
DIM sPkgPath AS String
DIM i AS Integer
-
-
+
PRINT "Installing final system configuration"
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF"
& " | grep ^CONF" TO sRawList
'Message.Info(sRawList)
@@ -760,6 +720,7 @@
sLinarr = Split(sRawList, ":")
sPkgPath = Right(sLinarr[0], Len(sLinarr[0]) - InStr(sLinarr[0], "\'"))
' now install the package
+ FrmInstallSys.tlCurrPkg.Text = "Installing Final
configuration files..."
INC iPkgNum
'hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sPkgPath)
@@ -770,27 +731,22 @@
WAIT 2
UNTIL
hproc.State = Process.Stopped
-' INC iPkgNum
END IF
' END IF
IF InStr(sDump, "FAILED") > 0 THEN
RETURN 1
ELSE
RETURN 0
- END IF
-
+ END IF
END
-
PUBLIC SUB Process_read()
DIM sLine AS String
READ #LAST, sLine, -256
sDump = sDump & gb.NewLine & sLine
- PRINT sLine
-
-
+ PRINT sLine
END
PUBLIC SUB process_error(msg AS String)
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Jul 31 11:30:52 2008
@@ -147,9 +147,9 @@
PUBLIC FUNCTION UPDATE_OVERALL_PROGRESS(iTotalPkgs AS Integer,
iCurrPkg AS Integer) AS Float
DIM fRet AS Float
- ' IF iTotalPkgs = 0 THEN
- ' iTotalPkgs = 10
- ' ENDIF
+ IF iTotalPkgs = 0 THEN
+ iTotalPkgs = 30
+ ENDIF
fRet = iCurrPkg / iTotalPkgs
fRet = Round(fRet, -2)
@@ -191,7 +191,7 @@
' END IF
' NEXT
' iQTY = sList.Count
- SHELL "find /mnt/cdrom -name *.tlz|wc -l" TO iQTY
+ SHELL "find " & ClsGlobal.sSourceMnt & " -name *.tlz|wc -l" TO iQTY
ELSE ' GOING FOR CUSTOM INSTALL
END IF
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-07-31 17:53:56
|
Author: M0...@gm...
Date: Fri Jul 25 09:11:00 2008
New Revision: 77
Modified:
branches/iVL/.lang/MdlSetup.pot
branches/iVL/FrmInstallSys.class
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlSetup.module
branches/iVL/Order
Log:
Disabled selecting the partition that hosts the ISO. this is for
security. more work on the package install function.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Fri Jul 25 09:11:00 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSetup.module
+# /home/moises/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Fri Jul 25 09:11:00 2008
@@ -35,8 +35,9 @@
PUBLIC SUB Form_Open()
' prepare the system
- ME.FrmProg.Text = " Preparing system for installation "
+ ME.FrmProg.Text = " Preparing system for installation "
+ ME.tlCurrStepLbl.Text = "Current Step"
ME.HIDE_PROGRES_CONTROLS()
@@ -84,14 +85,5 @@
END
-PUBLIC SUB SHOW_PROGRESS_CONTROLS()
-
- WITH ME
- .tlCurrStepLbl.Visible = TRUE
- .pbInstallProg.Visible = TRUE
- .tlCurrPkg2.Visible = TRUE
- .pbInstallProg2.Visible = TRUE
- END WITH
-
-END
+
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Jul 25 09:11:00 2008
@@ -66,6 +66,8 @@
'WRITE THE NEW FSTAB NOW, RIGHT BEFORE INSTALLING PACKAGES.
ME.WRITE_NEW_FSTAB() ' do this from the install form
+ 'redirect to packages install
+ 'ME.INSTALL_PACKAGES()
@@ -190,6 +192,8 @@
' perform custom install
ELSE
ME.PERFORM_FULL_INSTALL()
+ 're-direct to packages for now
+ 'ME.INSTALL_PACKAGES()
END IF
END
@@ -249,12 +253,13 @@
.Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
END WITH
-
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
ClsGlobal.sTargetMnt = "/mnt/target"
sFile = Split(File.Load(Temp$("SETUP.CONF")), "\n")
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
+
IF Left(sLine, Len("BULK") + 1) LIKE "BULK" & "*[0-9]*" THEN
'sLine = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
'sLine = Left(sLine, Len(sLine) - 1)
@@ -264,13 +269,13 @@
sPakPath = sEntry[0]
sPakSize = sEntry[1]
sPakDesc = sEntry[2]
- 'PRINT sBasePath &/ sPakPath & " = " & sPakDesc & "
size= " & CStr(sPakSize)
+ 'PRINT sBasePath &/ sPakPath & " = " & sPakDesc & "
size= " & CStr(sPakSize)
' figure out the sizing and the progrss meter
SHELL "export gsize=$(df| grep " &
ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
'Message(CStr(sTargetSize))
sTargetSize = Trim(CStr(sTargetSize))
sPakSize = Trim(CStr(sPakSize))
-' iTotalSize = CFloat(CInt(sTargetSize) + CInt(sPakSize))
+'
'RETURN
FrmInstallSys.tlCurrPkg.Text = "Installing " &
sPakDesc & " ..."
@@ -332,38 +337,25 @@
END
-
-
-
-
-
-PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
- DIM sPkg AS String
- DIM sShell AS String
- DIM hBulkInst AS Process
- DIM sExt AS String
- DIM sCMD AS String
-
- ClsGlobal.sTargetMnt = "/mnt/target"
-
- PRINT "Installing bulk packages ... "
- FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "veclinux" &/ "required")
- sExt = Trim(File.Ext(ClsGlobal.sSourceMnt &/ "veclinux"
&/ "required" &/ sPkg))
- SELECT CASE sExt
- CASE "tlz", "lzm", "lzma"
- sCMD = "lzmadec <" & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "required" &/ sPkg & " | tar -xp -C " & ClsGlobal.sTargetMnt
- END SELECT
- PRINT "Installing " & sPkg
- hBulkInst = SHELL sCMD WAIT
-
- NEXT
+PUBLIC SUB UPDATE_STEP_PROGRESS(iCurrSize AS Float, iProjectedSize AS Float)
+ DIM iMBProgress AS Float
+ DIM ipct AS Float
+ DIM iMinpct AS Float = ".01"
+ DIM iMaxpct AS Float = ".99"
+ DIM iVal AS Float
+ DIM iProgress AS Float
+ DIM sPakSize AS Variant
+ DIM sTargetSize AS Variant
+ DIM iTotalSize AS Integer
+ 'DIM iCurrSize AS Variant
END
+
PUBLIC FUNCTION INSTALL_PACKAGES() AS Integer
DIM i AS Integer
@@ -384,19 +376,24 @@
sTlzName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) -
InStr(sFile[i + 1], ":")))
sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove
the ./ from the location line
- END IF
+ PRINT " Install " & sTlzBasePath &/ sTlzPath &/ sTlzName
+ ' install each package
+
+
' now install the package with the information we already have
- sDump = ""
- sErr = ""
- hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
FOR READ
- WAIT 1
- IF hproc.State = Process.Running THEN
- REPEAT
- WAIT 2
- ' figure out the progress again
- UNTIL
- hproc.State = Process.Stopped
- END IF
+
+ ' sDump = ""
+ ' sErr = ""
+ ' hproc = SHELL "install-pkg " & sTlzBasePath &/
sTlzPath &/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo
\'FAILED\'" FOR READ
+ ' WAIT 1
+ ' IF hproc.State = Process.Running THEN
+ ' REPEAT
+ ' WAIT 2
+ ' ' figure out the progress again
+ ' UNTIL
+ ' hproc.State = Process.Stopped
+ ' END IF
+ END IF
NEXT
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Fri Jul 25 09:11:00 2008
@@ -79,6 +79,7 @@
MdlInstallSys.MOUNT_DEFINED_PARTITIONS() ' let the game begin
END IF
+ 'MdlInstallSys.MOUNT_DEFINED_PARTITIONS
END
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Fri Jul 25 09:11:00 2008
@@ -136,6 +136,11 @@
.Add("/usr")
.Add("/var")
.Add("/tmp")
+ IF InStr(FrmSelISO.lstInstallableImg.Text, .tag) THEN
+ .Enabled = FALSE
+ ELSE
+ .Enabled = TRUE
+ END IF
END WITH
oMountPoints.Add(cb)
i3drdrowX = cb.x + cb.Width + 8
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Fri Jul 25 09:11:00 2008
@@ -134,6 +134,17 @@
+PUBLIC SUB SHOW_PROGRESS_CONTROLS()
+
+ WITH FrmInstallSys
+ .tlCurrStepLbl.Visible = TRUE
+ .pbInstallProg.Visible = TRUE
+ .tlCurrPkg2.Visible = TRUE
+ .pbInstallProg2.Visible = TRUE
+ END WITH
+
+END
+
Modified: branches/iVL/Order
==============================================================================
--- branches/iVL/Order (original)
+++ branches/iVL/Order Fri Jul 25 09:11:00 2008
@@ -7,4 +7,10 @@
(09:56:13 AM) uelsk8s: they have to be installed or the install will break
-(07:38:13 AM) uelsk8s: for i in $(ls packages/*/*.tlz|grep -v
required);do install-pkg $i $ROOT || echo FAILED;done
\ No newline at end of file
+(07:38:13 AM) uelsk8s: for i in $(ls packages/*/*.tlz|grep -v
required);do install-pkg $i $ROOT || echo FAILED;done
+
+TODO:
+ + Add option to format partition to swap
+ + Modify partition listing so that it hides (or disables) selecting
the partition which hosts the ISO to be used for the new install
+ + Add option to mount (but not format) linux partitions. (add
/mnt/<partition_addr> to the combobox list)
+
\ No newline at end of file
|
|
From: <cod...@go...> - 2008-07-31 17:50:18
|
Author: M0...@gm...
Date: Thu Jul 24 11:11:50 2008
New Revision: 70
Added:
branches/iVL/Order
Modified:
branches/iVL/FrmInstallSys.class
branches/iVL/MdlInstallSys.module
Log:
Implement function to install bulk packages perdefinition in SETUP.CONF
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Thu Jul 24 11:11:50 2008
@@ -35,23 +35,28 @@
' ' ' ' ' ' ' ' ' IF sRes AND sRes <> 0 THEN
' ' ' ' ' ' ' ' ' RETURN ' exit... there was an error mounting
' ' ' ' ' ' ' ' ' END IF
- sRes = 0
- sRes = MdlInstallSys.WRITE_NEW_FSTAB()
- IF sRes AND sRes <> 0 THEN
- Message("Error writing fstab")
- RETURN
- END IF
- sRes = 0
- sRes = MdlInstallSys.INSTALL_BULK_PACKAGES()
+ 'sRes = 0
+ 'sRes = MdlInstallSys.WRITE_NEW_FSTAB()
+ ' IF sRes AND sRes <> 0 THEN
+ ' Message("Error writing fstab")
+ ' RETURN
+ ' END IF
+ 'sRes = 0
+ WAIT 3
+ IF ClsPkgSel.bCustom = TRUE THEN
+ ' DO THE CUSTOM INSTALL
+ ELSE
+ sRes = MdlInstallSys.PERFORM_FULL_INSTALL()
+ END IF
IF sRes AND sRes <> 0 THEN
Message("Error installing bulk packages")
RETURN
END IF
- sRes = 0
- sRes = MdlInstallSys.INSTALL_PACKAGES()
- IF sRes AND sRes <> 0 THEN
- RETURN
- END IF
+ ' sRes = 0
+ ' sRes = MdlInstallSys.INSTALL_PACKAGES()
+ ' IF sRes AND sRes <> 0 THEN
+ ' RETURN
+ ' END IF
' DONE WITH INSTALLATION. REBOOT THE SYSTEM.
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 24 11:11:50 2008
@@ -181,11 +181,11 @@
IF Exist(ClsGlobal.sTargetMnt &/ "etc") = FALSE THEN
MKDIR ClsGlobal.sTargetMnt &/ "etc"
END IF
- TRY File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "fstab", SConv(sFstab))
- CATCH
- PRINT ERROR
+ File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "fstab", SConv(sFstab))
+ 'CATCH
+ 'PRINT ERROR
'.RETURN 1
-
+ RETURN 0
END
PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String
@@ -210,89 +210,101 @@
END
-PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
+
+PUBLIC SUB PERFORM_FULL_INSTALL() AS Integer
+
+ 'Will need to read SETUP.CONF to determine what to do here
+
+ DIM sFile AS String[]
+ DIM sEntry AS String[]
+ DIM sPak AS String
+ DIM sPakPath AS String
+ DIM sPakSize AS Variant
+ DIM sTargetSize AS Variant
+ DIM iTotalSize AS Integer
+ DIM iCurrSize AS Variant
+ DIM sPakDesc AS String
DIM i AS Integer
+ DIM ii AS Integer
+ DIM sLine AS String
+ DIM sBulkPath AS String
+ DIM sConfPath AS String
+ DIM sOptPkgPath AS String
+ DIM iVal AS Float
+ DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
+ ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
+ sFile = Split(File.Load(Temp$("SETUP.CONF")), "\n")
+ FOR i = 0 TO sFile.count - 1
+ sLine = Trim(sFile[i])
+ IF Left(sLine, Len("BULK") + 1) LIKE "BULK" & "*[0-9]*" THEN
+ 'sLine = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
+ 'sLine = Left(sLine, Len(sLine) - 1)
+ sPak = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
+ sPak = Left(sPak, Len(sPak) - 1)
+ sEntry = Split(sPak, ":")
+ sPakPath = sEntry[0]
+ sPakSize = sEntry[1]
+ sPakDesc = sEntry[2]
+ 'PRINT sBasePath &/ sPakPath & " = " & sPakDesc & "
size= " & CStr(sPakSize)
+ ' figure out the sizing and the progrss meter
+ SHELL "export gsize=$(df| grep /dev/hda3) &&
echo $gsize | cut -f3 -d \' \'" TO sTargetSize
+ 'Message(CStr(sTargetSize))
+ iTotalSize = CInt(sTargetSize) + CInt(sPakSize)
+
+ 'RETURN
+ PRINT "Installing " & sPakPath & " Total size (KB) = "
& CStr(sPakSize)
+ hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " |
tar -xp -C " & ClsGlobal.sTargetMnt
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT
+ ' get the actual size at each snap
+ SHELL "export tsize=$(df | grep /dev/hda3)
&& echo $tsize | cut -f3 -d \' \'" TO iCurrSize
+ iCurrSize = Trim(CStr(iCurrSize))
+ iVal = CInt(iTotalSize) / CInt(iCurrSize)
+ 'FrmInstallSys.pbInstallProg.Value =
(CInt(iCurrSize) / CInt(iTotalSize)) * 0.100
+ 'PRINT CStr(iCurrSize) & "/" &
CStr(iTotalSize) & " = " & iVal & "%"
+ PRINT CStr(iTotalSize) & "/" &
CStr(iCurrSize) & " = " & iVal & "%"
+
+ UNTIL
+ hproc.State = Process.Stopped
+ END IF
+ PRINT sPak & " is installed... "
+ 'PRINT "Needs to install " & sPak
+ END IF
+ NEXT
+
+
+END
+
+
+
+
+
+
+PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
+ DIM sPkg AS String
DIM sShell AS String
- DIM sPKG AS String
- DIM sDump AS String
- DIM sBulkList AS String
- DIM sType AS String
- DIM sList AS String[]
- DIM sBulk AS String
- DIM sBulkPath AS String = ClsGlobal.sSourceMnt &/ "veclinux" &/ "required"
-
- SHELL "ls -m " & sBulkPath TO sBulkList
- sList = Split(sBulkList, ",")
- FOR i = 0 TO sList.Count - 1
- sBulk = Trim(sList[i])
- sType = File.Ext(sBulkPath &/ sBulk)
- ' SELECT CASE sType
- ' CASE "tlz", "lzm", "lzma"
- sShell = "lzmadec " & sBulkPath &/ sBulk & " | tar
-xp -C " & ClsGlobal.sTargetMnt
- 'Message(sBulkPath &/ sBulk & " | tar -xp -C " & ClsGlobal.sTargetMnt)
-' END SELECT
- 'Message(sShell)
- 'Message(ClsGlobal.sSourceMnt &/ "veclinux" &/ "required"
&/ sBulk)
+ DIM hBulkInst AS Process
+ DIM sExt AS String
+ DIM sCMD AS String
+
+ ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
+
+ PRINT "Installing bulk packages ... "
+ FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "veclinux" &/ "required")
+ sExt = Trim(File.Ext(ClsGlobal.sSourceMnt &/ "veclinux"
&/ "required" &/ sPkg))
+ SELECT CASE sExt
+ CASE "tlz", "lzm", "lzma"
+ sCMD = "lzmadec <" & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "required" &/ sPkg & " | tar -xp -C " & ClsGlobal.sTargetMnt
+ END SELECT
+ PRINT "Installing " & sPkg
+ hBulkInst = SHELL sCMD WAIT
- 'Message("type = " & sType & " command = " & sShell)
- hproc = SHELL sShell FOR READ
- WAIT
- IF hproc.State = Process.Running THEN
- REPEAT
- WAIT
- PRINT "Installing " & sBulk
- UNTIL
- hproc.State = Process.Stopped
- END IF
- NEXT
-
-
- ' ' '
- ' ' '
- ' ' ' IF ClsPkgSel.bCustom = TRUE THEN
- ' ' ' ' need to get the list of packages selected by user
- ' ' ' ELSE
- ' ' ' ' do the optional bulks first
- ' ' '
- ' ' ' 'FOR EACH sPKG IN RDir(ClsGlobal.sSourceMnt
&/ "veclinux" &/ "optional")
- ' ' ' SELECT CASE File.Ext(sPkg)
- ' ' ' CASE "tlz", "lzm", "lzma"
- ' ' ' sShell = "lzmadec < " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ "optional" &/ sPkg & " | tar -xp -C " & ClsGlobal.sTargetMnt
- ' ' '
- ' ' ' CASE "bz2", "tbz2", "tbz"
- ' ' ' sShell = "tar -xpjf " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ "optional" &/ sPkg & " -C " & ClsGlobal.sTargetMnt
- ' ' ' END SELECT
- ' ' '
- ' ' ' 'FrmInstallSys.tlCurrPkg.Text = "Installing " & sPkg
- ' ' '
- ' ' ' 'hproc = SHELL sShell
- ' ' ' Message(sShell)
- ' ' ' RETURN 1
- ' ' ' ME.INSTALL_TO_HOST(sShell)
- ' ' '
- ' ' ' ' ' WAIT
- ' ' ' ' ' IF hproc.State = Process.Running THEN
- ' ' ' ' ' REPEAT
- ' ' ' ' ' ' IF hproc.State = Process.Running THEN
- ' ' ' ' ' FrmInstallSys.pbInstallProg.Value =
FrmInstallSys.pbInstallProg.Value + 0.00001
- ' ' ' ' ' WAIT
- ' ' ' ' ' ' END IF
- ' ' ' ' ' UNTIL hproc.State = Process.Stopped
- ' ' ' ' ' 'END IF
- ' ' ' ' '
- ' ' ' ' ' sDump = Trim(sDump)
- ' ' ' ' ' sErr = Trim(sErr)
- ' ' ' ' ' IF serr <> "" THEN
- ' ' ' ' ' Message("There has been an error
installing " & sPkg & gb.NewLine & "<b>Error:</b>" & gb.NewLine & serr)
- ' ' ' ' ' RETURN 1
- ' ' ' ' ' END IF
- ' ' ' ' ' 'Message(sPkg & " is installed")
- ' ' ' ' ' END IF
- ' ' ' NEXT
- ' ' ' 'RETURN
- ' ' '
- ' ' ' END IF
- ' ' '
+ NEXT
+
+
+
END
@@ -324,4 +336,4 @@
sErr = sErr & gb.NewLine & sErr
PRINT MSG
-END
\ No newline at end of file
+END
Added: branches/iVL/Order
==============================================================================
--- (empty file)
+++ branches/iVL/Order Thu Jul 24 11:11:50 2008
@@ -0,0 +1,7 @@
+(09:55:32 AM) uelsk8s: 1 ... $MNTPNT/veclinux/required veclinux.tlz,
then vlconfig.tlz
+(09:55:32 AM) uelsk8s: 2 $MNTPNT/veclinux/optional
+(09:55:32 AM) uelsk8s: 3 $mntpnt/packages/* (except required)
+(09:55:32 AM) uelsk8s: 4 $mntpint/packages/required
+(09:55:32 AM) uelsk8s: 5 $MNTPNT/veclinux/required/vlconfig2.tlz
+(09:55:57 AM) uelsk8s: because they are not listed in packages.txt for
the user to select from
+(09:56:13 AM) uelsk8s: they have to be installed or the install will break
\ No newline at end of file
|
|
From: <cod...@go...> - 2008-07-31 17:46:48
|
Author: ue...@gm...
Date: Thu Jul 24 17:39:19 2008
New Revision: 72
Modified:
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/MdlDiskPart.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartFrmt.module
branches/iVL/Order
Log:
added code to update progress bar
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Thu Jul 24 17:39:19 2008
@@ -80,3 +80,4 @@
.pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.Height *
3, .tlCurrPkg.Width, 24)
END WITH
END
+
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Thu Jul 24 17:39:19 2008
@@ -11,11 +11,19 @@
MoveScaled(1,10,76,19)
Text = ("")
{ tlCurrPkg TextLabel
- MoveScaled(1,1,45,3.375)
- Text = ("TextLabel1")
+ MoveScaled(1,1,73,3)
+ Text = ("Installing ...")
}
{ pbInstallProg ProgressBar
- MoveScaled(1,7,25,3)
+ MoveScaled(1,5,44,3)
+ Visible = False
+ }
+ { pbInstallProg2 ProgressBar
+ MoveScaled(1,13,44,3)
+ }
+ { tlCurrPkg2 TextLabel
+ MoveScaled(1,9,45,3.1429)
+ Text = ("Total progress")
}
}
}
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Thu Jul 24 17:39:19 2008
@@ -27,13 +27,13 @@
'Desktop.Find("", "GParted")
- IF Exist("/usr/sbin/gparted") = FALSE THEN
+ IF Exist("/usr/bin/gparted") = FALSE THEN
Message.Error("Gparted was not found on this system. Please
install gparted and try again")
RETURN
END IF
FrmDiskPart.tlBanner.Text = "<h3>Loading gparted .... Please wait</h3>"
- SHELL "/usr/sbin/gparted"
+ SHELL "/usr/bin/gparted"
WAIT 3
sTitle = "GParted"
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 24 17:39:19 2008
@@ -25,7 +25,7 @@
' this is where we need to set the mount target
'ClsGlobal.sTargetMnt = "/mnt/target"
- ClsGlobal.sTargetMnt = "/home/moises/mnt/target" ' just for testing now.
+ ClsGlobal.sTargetMnt = "/mnt/target" ' just for testing now.
IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
END IF
@@ -35,12 +35,12 @@
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
'/DISABLED FOR TESTING INSTALL ONLY
- ' ' ' ' SHELL "mount " & ClsPartSel.sRoot & Space(1) &
ClsGlobal.sTargetMnt & Space(1) & " -t " & ClsPartSel.fRoot WAIT 'moun
the root partition first
- ' ' ' ' IF ClsPartSel.sHome THEN
- ' ' ' ' SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
- ' ' ' ' SHELL "mount " & ClsPartSel.sHome & Space(1) &
ClsGlobal.sTargetMnt &/ "home -t " & ClsPartSel.fhome WAIT 'mount the
home partition if defined
+ SHELL "mount " & ClsPartSel.sRoot & Space(1) &
ClsGlobal.sTargetMnt WAIT 'moun the root partition first
+ IF ClsPartSel.sHome THEN
+ SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
+ SHELL "mount " & ClsPartSel.sHome & Space(1) &
ClsGlobal.sTargetMnt &/ "home -t " & ClsPartSel.fhome WAIT 'mount the
home partition if defined
- ' ' ' ' END IF
+ END IF
IF ClsPartSel.sUsr THEN
SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "usr" WAIT
SHELL "mount " & ClsPartSel.sUsr & Space(1) &
ClsGlobal.sTargetMnt &/ "usr -t" & ClsPartSel.fUsr WAIT ' mount the
user partition
@@ -173,7 +173,7 @@
'Message(sFstab)
IF NOT ClsGlobal.sTargetMnt OR ClsGlobal.sTargetMnt = "" THEN
- ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
+ ClsGlobal.sTargetMnt = "/mnt/target"
END IF
';Message(ClsGlobal.sTargetMnt &/ "etc")
@@ -232,7 +232,12 @@
DIM sOptPkgPath AS String
DIM iVal AS Float
DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
- ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
+ DIM iProgress AS Float
+ DIM iMBProgress AS Float
+ DIM ipct AS Float
+ DIM iMinpct AS Float = ".01"
+ DIM iMaxpct AS Float = ".99"
+ ClsGlobal.sTargetMnt = "/mnt/target"
sFile = Split(File.Load(Temp$("SETUP.CONF")), "\n")
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
@@ -247,36 +252,44 @@
sPakDesc = sEntry[2]
'PRINT sBasePath &/ sPakPath & " = " & sPakDesc & "
size= " & CStr(sPakSize)
' figure out the sizing and the progrss meter
- iTotalSize = 0
- sTargetSize = 0
-
- SHELL "export gsize=$(df| grep /dev/hda3) &&
echo $gsize | cut -f3 -d \' \'" TO sTargetSize
+ SHELL "export gsize=$(df| grep " &
ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
'Message(CStr(sTargetSize))
iTotalSize = CInt(sTargetSize) + CInt(sPakSize)
-
'RETURN
+ FrmInstallSys.tlCurrPkg.Text = "Installing " & sPak
PRINT "Installing " & sPakPath & " Total size (KB) = "
& CStr(sPakSize)
- FrmInstallSys.tlCurrPkg.Text = "Installing " &
sPakDesc & " ... "
hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " |
tar -xp -C " & ClsGlobal.sTargetMnt
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
- WAIT 3
+ WAIT 1
' get the actual size at each snap
- SHELL "export tsize=$(df | grep /dev/hda3)
&& echo $tsize | cut -f3 -d \' \'" TO iCurrSize
+ SHELL "export gsize=$(df| grep " &
ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO iCurrSize
iCurrSize = Trim(CStr(iCurrSize))
- 'iVal = Round(CInt(iCurrSize) /
CInt(iTotalSize), -2) 'CInt(iTotalSize) / CInt(iCurrSize)
- iVal = Round((iTotalSize - iCurrSize) /
iTotalSize, -2)
+ iProgress = CInt(iCurrSize - sTargetSize)
+ iMBProgress = iProgress / 1024
+ IF iMBProgress > CFloat(sPakSize) THEN
+ iVal = iMaxpct
+ ELSE
+ ipct = 100 * iMBProgress
+ iVal = ipct / sPakSize * 10
+ IF iVal < iMinpct THEN
+ iVal = iMinpct
+ ENDIF
+ IF iVal > iMaxpct THEN
+ iVal = iMaxpct
+ ENDIF
+ ENDIF
'FrmInstallSys.pbInstallProg.Value =
(CInt(iCurrSize) / CInt(iTotalSize)) * 0.100
'PRINT CStr(iCurrSize) & "/" &
CStr(iTotalSize) & " = " & iVal & "%"
- PRINT CStr(iTotalSize) & "/" &
CStr(iCurrSize) & " = " & iVal
+ PRINT CStr(iCurrSize) & "/" &
CStr(iTotalSize) & " = " & iVal & "%"
FrmInstallSys.pbInstallProg.Value = iVal
-
+
UNTIL
hproc.State = Process.Stopped
END IF
- PRINT sPakDesc & " is installed... "
+ PRINT sPak & " is installed... "
'PRINT "Needs to install " & sPak
END IF
NEXT
@@ -296,7 +309,7 @@
DIM sExt AS String
DIM sCMD AS String
- ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
+ ClsGlobal.sTargetMnt = "/mnt/target"
PRINT "Installing bulk packages ... "
FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "veclinux" &/ "required")
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Thu Jul 24 17:39:19 2008
@@ -31,9 +31,11 @@
CASE "ext3"
sCommand = "mke2fs -q -j " & saddr
CASE "reiserfs"
- sCommand = "mkreiserfs --format 3.6 -ff " & sAddr
+ sCommand = "mkreiserfs --format 3.6 -q " & sAddr
CASE "xfs"
sCommand = "mkfs.xfs -f " & sAddr
+ CASE "jfs"
+ sCommand = "mkfs.jfs -q " & sAddr
END SELECT
hproc = SHELL sCommand & " | echo \'FAILED\'" FOR READ
Modified: branches/iVL/Order
==============================================================================
--- branches/iVL/Order (original)
+++ branches/iVL/Order Thu Jul 24 17:39:19 2008
@@ -4,18 +4,4 @@
(09:55:32 AM) uelsk8s: 4 $mntpint/packages/required
(09:55:32 AM) uelsk8s: 5 $MNTPNT/veclinux/required/vlconfig2.tlz
(09:55:57 AM) uelsk8s: because they are not listed in packages.txt for
the user to select from
-(09:56:13 AM) uelsk8s: they have to be installed or the install will break
-
-
-10:38:40 AM) uelsk8s: :)
-(10:39:45 AM) uelsk8s: mbused() {
-(10:39:46 AM) uelsk8s: MB=0
-(10:39:46 AM) uelsk8s: for DEV in $DEVICES ; do
-(10:39:46 AM) uelsk8s: line=`df | grep $DEV`
-(10:39:46 AM) uelsk8s: if [ "$line" ]; then
-(10:39:46 AM) uelsk8s: mb1=`echo $line | cut -f 3 -d ' '`
-(10:39:48 AM) uelsk8s: MB=`expr $MB '+' $mb1`
-(10:39:50 AM) uelsk8s: fi
-(10:39:52 AM) uelsk8s: done;
-(10:39:54 AM) uelsk8s: echo $MB
-(10:39:56 AM) uelsk8s: }
\ No newline at end of file
+(09:56:13 AM) uelsk8s: they have to be installed or the install will break
\ No newline at end of file
|
|
From: <cod...@go...> - 2008-07-31 17:43:26
|
Author: M0...@gm...
Date: Fri Jul 25 08:19:29 2008
New Revision: 76
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/MdlDiskPart.module
branches/iVL/MdlInstallSys.module
branches/iVL/Order
Log:
- Modified install window to fix object resizing and position.
- MdlDiskPart - Modified embedding function in an attempt to accurately get
GParted to embed.
- Began working on function that install individual packages.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Fri Jul 25 08:19:29 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/.project
+# /home/moises/area-51/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Jul 25 08:19:29 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Fri Jul 25 08:19:29 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlCore.module
+# /home/moises/area-51/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Fri Jul 25 08:19:29 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlDiskPart.module
+# /home/moises/area-51/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Fri Jul 25 08:19:29 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPartSel.module
+# /home/moises/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Fri Jul 25 08:19:29 2008
@@ -26,74 +26,20 @@
FMain.tvPlan["Inst2"].Picture = MdlCore.sNowPic
FMain.tvPlan["Inst2"].Selected = TRUE
- 'initiate install procedure
- ' 1: MOUNT PARTITIONS
- ' 2: Write /etc/fstab
- ' 3: Install packages
-
- ' CAN'T TEST THIS UNTIL I GET A GOOD TESTING ENVIRONMENT
- ' ' ' ' ' ' ' ' ' sRes = MdlInstallSys.MOUNT_DEFINED_PARTITIONS()
- ' ' ' ' ' ' ' ' ' IF sRes AND sRes <> 0 THEN
- ' ' ' ' ' ' ' ' ' RETURN ' exit... there was an error mounting
- ' ' ' ' ' ' ' ' ' END IF
- 'sRes = 0
- 'sRes = MdlInstallSys.WRITE_NEW_FSTAB()
- ' IF sRes AND sRes <> 0 THEN
- ' Message("Error writing fstab")
- ' RETURN
- ' END IF
- 'sRes = 0
- WAIT 3
-
+
MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' formats partitions and mounts them
END
PUBLIC SUB Form_Open()
-
- ME.Maximized = TRUE
-
+
' prepare the system
ME.FrmProg.Text = " Preparing system for installation "
- WITH ME
- .pbInstallProg.Visible = FALSE
- .pbInstallProg2.Visible = FALSE
- .tlCurrPkg2.Visible = FALSE
- .FrmProg.Width = .ClientWidth - .FrmProg.Left * 2
- .tlCurrPkg.Move(4, 24, .FrmProg.Width - .tlCurrPkg.Left * 2)
- .pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.top
+ .tlCurrPkg.Height + 4, .tlCurrPkg.width, 27)
- .tlCurrPkg2.Move(.tlCurrPkg.Left, .pbInstallProg.top
+ .pbInstallProg.Height * 2, .pbInstallProg.width, 27)
- .pbInstallProg2.Move(.tlCurrPkg.Left, .tlCurrPkg2.top
+ .tlCurrPkg2.Height + 8, .tlCurrPkg.width, 27)
- END WITH
-
-
-
-
-
-
-
- '
- ' IF ClsPkgSel.bCustom = TRUE THEN
- ' ' DO THE CUSTOM INSTALL
- ' ELSE
- ' 'sRes = MdlInstallSys.PERFORM_FULL_INSTALL()
- ' MdlInstallSys.MOUNT_DEFINED_PARTITIONS()
- ' END IF
- ' IF sRes AND sRes <> 0 THEN
- ' Message("Error installing bulk packages")
- ' RETURN
- ' END IF
- ' sRes = 0
- ' sRes = MdlInstallSys.INSTALL_PACKAGES()
- ' IF sRes AND sRes <> 0 THEN
- ' RETURN
- ' END IF
-
- ' DONE WITH INSTALLATION. REBOOT THE SYSTEM.
-
-
+
+
+ME.HIDE_PROGRES_CONTROLS()
ME.BEGIN_PROCESS()
END
@@ -106,11 +52,46 @@
PUBLIC SUB Form_Resize()
+ DIM iMinFrameH AS Integer
+ iMinFrameH = ME.tlCurrPkg.Height + ME.tlCurrPkg2.Height +
ME.tlCurrStepLbl.Height + ME.pbInstallProg2.Height +
ME.tlCurrStepLbl.Height + 36
+ WITH ME
+ .FrmProg.Move(4, .tlBanner.top + .tlBanner.Height +
8, .ClientWidth - (.FrmProg.Left * 2), iMinFrameH)
+ .tlBanner.Move(4, 16, .ClientWidth - (.tlBanner.Left * 2))
+ '.tlBanner.Border = Border.Plain
+ .FrmProg.Move(4, .tlBanner.top + (.tlBanner.Height +
8), .ClientWidth - (.FrmProg.Left * 2))
+ .tlCurrPkg.move(8, 32, .FrmProg.Width - (.tlCurrPkg.Left * 2))
+ .tlCurrStepLbl.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 4),
MdlObjSizer.get_object_width(.tlCurrStepLbl.Text) + 8, 27)
+ .pbInstallProg.Move(.tlCurrStepLbl.left +
(.tlCurrStepLbl.Width), .tlCurrStepLbl.top, .FrmProg.Width -
(.tlCurrStepLbl.Width + (.tlcurrsteplbl.left * 2)))
+ .tlCurrPkg2.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height * 2.5), .FrmProg.Width - (.tlCurrPkg.Left * 2))
+ .pbInstallProg2.Move(.tlCurrPkg2.Left, .tlCurrPkg2.top +
(.tlCurrPkg2.Height + 2), .tlCurrPkg2.Width, 27)
+
+ '.pbInstallProg.Move(.tlCurrStepLbl.Left + (.tlCurrStepLbl.Width
+ 2), .FrmProg.Width - (.tlCurrStepLbl.Width + (.tlCurrStepLbl.left * 2))) '
+ '.pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.top +
(.tlCurrPkg.Height + 2), .tlCurrPkg.Width)
+
+ END WITH
+
+
+END
+
+PUBLIC SUB HIDE_PROGRES_CONTROLS()
+
WITH ME
- .tlBanner.Move(4, 16, .ClientWidth - 16)
- .FrmProg.Move(.tlBanner.Left, .tlBanner.Height * 4, .ClientWidth - 8)
- .tlCurrPkg.Move(4, 8, .FrmProg.Width - 8)
- .pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.Height *
3, .tlCurrPkg.Width, 24)
- END WITH
+ .tlCurrStepLbl.Visible = FALSE
+ .pbInstallProg.Visible = FALSE
+ .tlCurrPkg2.Visible = FALSE
+ .pbInstallProg2.Visible = FALSE
+ END WITH
+
+END
+
+PUBLIC SUB SHOW_PROGRESS_CONTROLS()
+
+ WITH ME
+ .tlCurrStepLbl.Visible = TRUE
+ .pbInstallProg.Visible = TRUE
+ .tlCurrPkg2.Visible = TRUE
+ .pbInstallProg2.Visible = TRUE
+ END WITH
+
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Fri Jul 25 08:19:29 2008
@@ -4,26 +4,30 @@
MoveScaled(0,0,78,51)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(1,1,63,8)
+ MoveScaled(1,1,63,5)
Text = ("Vectorlinux is currently being installed to your
system... Please wait")
}
{ FrmProg Frame
MoveScaled(1,10,76,34)
Text = ("")
{ tlCurrPkg TextLabel
- MoveScaled(1,1,73,3)
+ MoveScaled(2,1,73,3.375)
Text = ("Installing ...")
}
{ pbInstallProg ProgressBar
- MoveScaled(1,5,44,3)
- Visible = False
+ MoveScaled(1,11,44,2)
+ Label = False
}
{ pbInstallProg2 ProgressBar
- MoveScaled(1,13,44,3)
+ MoveScaled(1,19,44,3.375)
}
{ tlCurrPkg2 TextLabel
- MoveScaled(1,9,45,3)
+ MoveScaled(1,15,45,3.375)
Text = ("Total progress")
+ }
+ { tlCurrStepLbl TextLabel
+ MoveScaled(2,5,11,3)
+ Text = ("Current Step ")
}
}
}
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Fri Jul 25 08:19:29 2008
@@ -20,6 +20,7 @@
DIM sTitle AS String
+ DIM sTitle1 AS String
DIM aHandle AS NEW Pointer[]
DIM iHandle AS Integer
DIM i AS Integer = 0
@@ -36,14 +37,21 @@
SHELL "/usr/bin/gparted"
WAIT 3
- sTitle = "GParted"
- IF Left(sTitle, 2) = "0x" THEN
+ sTitle = "/dev/hda - GParted"
+ sTitle1 = "/dev/sda - GParted"
+
+ 'aHandle = Desktop.Find(sTitle)
+ aHandle = Desktop.Find(sTitle)
+ IF aHandle = "" THEN
+ aHandle = Desktop.Find(sTitle1)
+ END IF
+
+ IF Left(sTitle, 2) = "0x" THEN
iHandle = Val("&" & Mid$(sTitle, 3))
ELSE IF Left(sTitle) = "&" THEN
iHandle = Val(sTitle)
ELSE
- 'aHandle = Desktop.Find(sTitle)
- aHandle = Desktop.Find(sTitle)
+
'Message.Info(aHandle[0])
IF aHandle.Count = 0 THEN
REPEAT
@@ -53,7 +61,7 @@
UNTIL
i = 10 OR aHandle.Count > 0
IF aHandle.Count = 0 THEN
- Message("Setup is unable to successfully run gslapt on this
system. This may be a sign of \n" &
+ Message("Setup is unable to successfully run gparted on this
system. This may be a sign of \n" &
"a bad install media. Setup cannot continue.")
RETURN
END IF
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Jul 25 08:19:29 2008
@@ -222,6 +222,8 @@
DIM sFile AS String[]
DIM sEntry AS String[]
+ DIM stlzList AS String[]
+ DIM sTlz AS String
DIM sPak AS String
DIM sPakPath AS String
DIM sPakSize AS Variant
@@ -324,6 +326,9 @@
NEXT
FrmInstallSys.tlBanner.Text = "Finished intalling Bulks"
+ ' now to the packages individually
+
+
END
@@ -361,16 +366,45 @@
PUBLIC FUNCTION INSTALL_PACKAGES() AS Integer
-
+ DIM i AS Integer
+ DIM sFile AS String[]
+ DIM sLine AS String
+ DIM sRawFile AS String
+ DIM sTlzPath AS String
+ DIM sTlzName AS String
+ DIM sTlzDesc AS String
+ DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
+
+ sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT"))
+
+ sFile = Split(sRawFile, "\n")
+ FOR i = 0 TO sFile.count - 1
+ sLine = Trim(sFile[i])
+ IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
+ sTlzName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
+ sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) -
InStr(sFile[i + 1], ":")))
+ sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove
the ./ from the location line
+ END IF
+ ' now install the package with the information we already have
+ sDump = ""
+ sErr = ""
+ hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
FOR READ
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT 2
+ ' figure out the progress again
+ UNTIL
+ hproc.State = Process.Stopped
+ END IF
+ NEXT
+
+
+
END
-PUBLIC FUNCTION INSTALL_TO_HOST(sCmnd AS String) AS Integer
- hproc = SHELL sCmnd FOR READ
-
-
-END
PUBLIC SUB Process_read()
Modified: branches/iVL/Order
==============================================================================
--- branches/iVL/Order (original)
+++ branches/iVL/Order Fri Jul 25 08:19:29 2008
@@ -4,4 +4,7 @@
(09:55:32 AM) uelsk8s: 4 $mntpint/packages/required
(09:55:32 AM) uelsk8s: 5 $MNTPNT/veclinux/required/vlconfig2.tlz
(09:55:57 AM) uelsk8s: because they are not listed in packages.txt for
the user to select from
-(09:56:13 AM) uelsk8s: they have to be installed or the install will break
\ No newline at end of file
+(09:56:13 AM) uelsk8s: they have to be installed or the install will break
+
+
+(07:38:13 AM) uelsk8s: for i in $(ls packages/*/*.tlz|grep -v
required);do install-pkg $i $ROOT || echo FAILED;done
\ No newline at end of file
|
|
From: <cod...@go...> - 2008-07-31 17:39:19
|
Author: M0...@gm...
Date: Thu Jul 24 15:04:10 2008
New Revision: 71
Modified:
branches/iVL/MdlInstallSys.module
branches/iVL/Order
Log:
Bulks are now installing, but progressbar value is not being figured
out correctly. FIX NOW
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 24 15:04:10 2008
@@ -247,29 +247,36 @@
sPakDesc = sEntry[2]
'PRINT sBasePath &/ sPakPath & " = " & sPakDesc & "
size= " & CStr(sPakSize)
' figure out the sizing and the progrss meter
+ iTotalSize = 0
+ sTargetSize = 0
+
SHELL "export gsize=$(df| grep /dev/hda3) &&
echo $gsize | cut -f3 -d \' \'" TO sTargetSize
'Message(CStr(sTargetSize))
iTotalSize = CInt(sTargetSize) + CInt(sPakSize)
+
'RETURN
PRINT "Installing " & sPakPath & " Total size (KB) = "
& CStr(sPakSize)
+ FrmInstallSys.tlCurrPkg.Text = "Installing " &
sPakDesc & " ... "
hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " |
tar -xp -C " & ClsGlobal.sTargetMnt
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
- WAIT
+ WAIT 3
' get the actual size at each snap
SHELL "export tsize=$(df | grep /dev/hda3)
&& echo $tsize | cut -f3 -d \' \'" TO iCurrSize
iCurrSize = Trim(CStr(iCurrSize))
- iVal = CInt(iTotalSize) / CInt(iCurrSize)
+ 'iVal = Round(CInt(iCurrSize) /
CInt(iTotalSize), -2) 'CInt(iTotalSize) / CInt(iCurrSize)
+ iVal = Round((iTotalSize - iCurrSize) /
iTotalSize, -2)
'FrmInstallSys.pbInstallProg.Value =
(CInt(iCurrSize) / CInt(iTotalSize)) * 0.100
'PRINT CStr(iCurrSize) & "/" &
CStr(iTotalSize) & " = " & iVal & "%"
- PRINT CStr(iTotalSize) & "/" &
CStr(iCurrSize) & " = " & iVal & "%"
+ PRINT CStr(iTotalSize) & "/" &
CStr(iCurrSize) & " = " & iVal
+ FrmInstallSys.pbInstallProg.Value = iVal
UNTIL
hproc.State = Process.Stopped
END IF
- PRINT sPak & " is installed... "
+ PRINT sPakDesc & " is installed... "
'PRINT "Needs to install " & sPak
END IF
NEXT
Modified: branches/iVL/Order
==============================================================================
--- branches/iVL/Order (original)
+++ branches/iVL/Order Thu Jul 24 15:04:10 2008
@@ -4,4 +4,18 @@
(09:55:32 AM) uelsk8s: 4 $mntpint/packages/required
(09:55:32 AM) uelsk8s: 5 $MNTPNT/veclinux/required/vlconfig2.tlz
(09:55:57 AM) uelsk8s: because they are not listed in packages.txt for
the user to select from
-(09:56:13 AM) uelsk8s: they have to be installed or the install will break
\ No newline at end of file
+(09:56:13 AM) uelsk8s: they have to be installed or the install will break
+
+
+10:38:40 AM) uelsk8s: :)
+(10:39:45 AM) uelsk8s: mbused() {
+(10:39:46 AM) uelsk8s: MB=0
+(10:39:46 AM) uelsk8s: for DEV in $DEVICES ; do
+(10:39:46 AM) uelsk8s: line=`df | grep $DEV`
+(10:39:46 AM) uelsk8s: if [ "$line" ]; then
+(10:39:46 AM) uelsk8s: mb1=`echo $line | cut -f 3 -d ' '`
+(10:39:48 AM) uelsk8s: MB=`expr $MB '+' $mb1`
+(10:39:50 AM) uelsk8s: fi
+(10:39:52 AM) uelsk8s: done;
+(10:39:54 AM) uelsk8s: echo $MB
+(10:39:56 AM) uelsk8s: }
\ No newline at end of file
|
|
From: <cod...@go...> - 2008-07-31 17:35:21
|
Author: M0E.lnx
Date: Thu Jul 24 21:00:10 2008
New Revision: 75
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/FMain.class
branches/iVL/FMain.form
Log:
- Added .backcolor = color.selectedbackground property to the top logo
- Resized the back logo and extended its background all over the screen
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Jul 24 21:00:10 2008
@@ -14,23 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:247
+#: FMain.class:250
msgid "Process Overview"
msgstr ""
-#: FMain.class:261
-msgid "VectorLinux Install"
-msgstr ""
-
-#: FMain.class:272
+#: FMain.class:273
msgid "Next"
msgstr ""
-#: FMain.class:278
+#: FMain.class:279
msgid "Back"
msgstr ""
-#: FMain.class:284
+#: FMain.class:285
msgid "Exit"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Jul 24 21:00:10 2008
@@ -35,11 +35,11 @@
FrmSelISO.Reparent(ME.pnlWinHost)
FrmSelISO.Width = pnlWinHost.Width
FrmSelISO.Height = pnlWinHost.Height
-iImg = Image.Load("images/installer.png").Stretch(600, 80)
+iImg = Image.Load("images/installer.png").Stretch(400, 50)
'iImg.Resize(600, 80)
PictureBox1.Resize(iImg.Width, iImg.Height)
PictureBox1.Picture = iImg.Picture
-
+PictureBox1.Background = Color.SelectedBackground
PictureBox1.Stretch = TRUE
FrmSelISO.Show
@@ -54,6 +54,7 @@
.btQuit.Text = "Exit Installation"
.tvPlan["Prep0"].Selected = TRUE
.tvPlan["Prep0"].Picture = MdlCore.sNowPic
+ .tlBanner.Height = .PictureBox1.Height
END WITH
'ME.TreeView1.BackColor = Color.Transparent
@@ -112,6 +113,8 @@
.btQuit.Move(.pnlWinHost.Left + (.pnlWinHost.Width / 2) -
(.btQuit.Width / 2), .btback.top)
'.PictureBox1.Move(Desktop.Width / 2 - (.PictureBox1.Width / 2), 4)
.PictureBox1.Move(.ClientWidth / 2 - (.PictureBox1.Width / 2), 4)
+ .tlBanner.Height = .PictureBox1.Height
+ .tlBanner.top = .PictureBox1.Top
END WITH
END
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Thu Jul 24 21:00:10 2008
@@ -13,29 +13,27 @@
}
{ tlBanner TextLabel
MoveScaled(0,0,26,7)
- Visible = False
Font = Font["+6"]
Background = Color.SelectedBackground
Foreground = Color.SelectedForeground
- Text = ("VectorLinux Install")
+ Text = ("")
Alignment = Align.Center
- Transparent = True
}
{ pnlWinHost VBox
MoveScaled(28,9,66,56)
}
{ btnext Button
- MoveScaled(49,67,8,3.1)
+ MoveScaled(49,67,8,3)
Text = ("Next")
Picture = Picture["icon:/16/right"]
}
{ btback Button
- MoveScaled(28,67,8,3.1)
+ MoveScaled(28,67,8,3)
Text = ("Back")
Picture = Picture["icon:/16/left"]
}
{ btQuit Button
- MoveScaled(38,67,11,3.1)
+ MoveScaled(38,67,11,3)
Text = ("Exit")
Picture = Picture["icon:/16/cancel"]
}
|
|
From: <cod...@go...> - 2008-07-31 17:31:47
|
Author: M0E.lnx
Date: Thu Jul 24 20:46:36 2008
New Revision: 74
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FMain.class
branches/iVL/FrmHostPrep.class
branches/iVL/FrmHostPrep.form
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/MdlCore.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlPartSel.module
Log:
- Implementer partition formatting per user definitions
- Improved progress metering
- Removed balloon message from partition selection (this was getting annoying)
- Bypassed the FrmHostPrep module and Form. These functions will be
done in
right before the install process begins, in the install window.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/.project
+# /root/gui-installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsGlobal.class
+# /root/gui-installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsPartSel.class
+# /root/gui-installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsWinDrives.class
+# /root/gui-installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /root/gui-installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:245
+#: FMain.class:247
msgid "Process Overview"
msgstr ""
-#: FMain.class:259
+#: FMain.class:261
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:270
+#: FMain.class:272
msgid "Next"
msgstr ""
-#: FMain.class:276
+#: FMain.class:278
msgid "Back"
msgstr ""
-#: FMain.class:282
+#: FMain.class:284
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmDiskPart.class
+# /root/gui-installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmLicense.class
+# /root/gui-installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartScheme.class
+# /root/gui-installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartSel.class
+# /root/gui-installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPkgSel.class
+# /root/gui-installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSelISO.class
+# /root/gui-installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSummary.class
+# /root/gui-installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmWinDrives.class
+# /root/gui-installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlCore.module
+# /root/gui-installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlDiskPart.module
+# /root/gui-installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlObjSizer.module
+# /root/gui-installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPartSel.module
+# /root/gui-installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPkgSel.module
+# /root/gui-installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSetup.module
+# /root/gui-installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSummarize.module
+# /root/gui-installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Jul 24 20:46:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlWinDrives.module
+# /root/gui-installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Jul 24 20:46:36 2008
@@ -28,7 +28,8 @@
PUBLIC SUB Form_Open()
DIM iImg AS Image
-
+ME.Maximized = TRUE
+MdlCore.LOCK_GUI()
ClsGlobal.sBackNav = NEW Object[]
ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
FrmSelISO.Reparent(ME.pnlWinHost)
@@ -184,7 +185,8 @@
'Move on to selecting packages
frmNext = FrmPkgSel
CASE "FrmSummary"
- frmNext = FrmHostPrep ' prepare host
+ ' frmNext = FrmHostPrep ' prepare host
+ frmNext = FrmInstallSys
END SELECT
Modified: branches/iVL/FrmHostPrep.class
==============================================================================
--- branches/iVL/FrmHostPrep.class (original)
+++ branches/iVL/FrmHostPrep.class Thu Jul 24 20:46:36 2008
@@ -29,12 +29,13 @@
' may need to move this code to another event. The FormOpen event
only happens once.
'ME.PREPARE_ALL_PARTITIONS()
WAIT
- FrmInstallSys.Reparent(ME.Parent)
- ME.Hide
- FrmInstallSys.Show
+ ' FrmInstallSys.Reparent(ME.Parent)
+ ' ME.Hide
+ ' FrmInstallSys.Show
' ME.Hide
+ME.Resize(ME.Parent.Width, ME.Parent.Height)
-
+ ME.PREPARE_ALL_PARTITIONS()
END
@@ -81,6 +82,10 @@
RETURN
ELSE
'move on to installing.. first, make fstab
+ FrmInstallSys.Reparent(ME.Parent)
+ ME.Hide
+ FrmInstallSys.Show()
+
END IF
END
Modified: branches/iVL/FrmHostPrep.form
==============================================================================
--- branches/iVL/FrmHostPrep.form (original)
+++ branches/iVL/FrmHostPrep.form Thu Jul 24 20:46:36 2008
@@ -4,7 +4,7 @@
MoveScaled(0,0,73,48)
Text = ("")
{ tlbanner TextLabel
- MoveScaled(1,1,59,3.375)
+ MoveScaled(1,1,59,6)
Text = ("Vectorlinux is preparing your system for installation.
Please wait.")
}
{ frmStatus Frame
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Thu Jul 24 20:46:36 2008
@@ -17,13 +17,14 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
-PUBLIC SUB Form_Open()
- DIM sRes AS Integer ' we will need to
+PUBLIC SUB BEGIN_PROCESS()
+
+ DIM sRes AS Integer ' we will need to
FMain.FrmCurr = ME
- FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
- FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
- FMain.tvPlan["Inst1"].Selected = TRUE
+ FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Inst2"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Inst2"].Selected = TRUE
'initiate install procedure
' 1: MOUNT PARTITIONS
@@ -43,15 +44,47 @@
' END IF
'sRes = 0
WAIT 3
- IF ClsPkgSel.bCustom = TRUE THEN
- ' DO THE CUSTOM INSTALL
- ELSE
- sRes = MdlInstallSys.PERFORM_FULL_INSTALL()
- END IF
- IF sRes AND sRes <> 0 THEN
- Message("Error installing bulk packages")
- RETURN
- END IF
+
+ MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' formats partitions and mounts them
+
+END
+
+
+PUBLIC SUB Form_Open()
+
+ ME.Maximized = TRUE
+
+ ' prepare the system
+ ME.FrmProg.Text = " Preparing system for installation "
+ WITH ME
+ .pbInstallProg.Visible = FALSE
+ .pbInstallProg2.Visible = FALSE
+ .tlCurrPkg2.Visible = FALSE
+ .FrmProg.Width = .ClientWidth - .FrmProg.Left * 2
+ .tlCurrPkg.Move(4, 24, .FrmProg.Width - .tlCurrPkg.Left * 2)
+ .pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.top
+ .tlCurrPkg.Height + 4, .tlCurrPkg.width, 27)
+ .tlCurrPkg2.Move(.tlCurrPkg.Left, .pbInstallProg.top
+ .pbInstallProg.Height * 2, .pbInstallProg.width, 27)
+ .pbInstallProg2.Move(.tlCurrPkg.Left, .tlCurrPkg2.top
+ .tlCurrPkg2.Height + 8, .tlCurrPkg.width, 27)
+ END WITH
+
+
+
+
+
+
+
+
+ '
+ ' IF ClsPkgSel.bCustom = TRUE THEN
+ ' ' DO THE CUSTOM INSTALL
+ ' ELSE
+ ' 'sRes = MdlInstallSys.PERFORM_FULL_INSTALL()
+ ' MdlInstallSys.MOUNT_DEFINED_PARTITIONS()
+ ' END IF
+ ' IF sRes AND sRes <> 0 THEN
+ ' Message("Error installing bulk packages")
+ ' RETURN
+ ' END IF
' sRes = 0
' sRes = MdlInstallSys.INSTALL_PACKAGES()
' IF sRes AND sRes <> 0 THEN
@@ -61,7 +94,7 @@
' DONE WITH INSTALLATION. REBOOT THE SYSTEM.
-
+ME.BEGIN_PROCESS()
END
@@ -75,8 +108,8 @@
WITH ME
.tlBanner.Move(4, 16, .ClientWidth - 16)
- .FrmProg.Move(.tlBanner.Left, .tlBanner.Height * 2, .ClientWidth - 8)
- .tlCurrPkg.Move(4, 4, .FrmProg.Width - 8)
+ .FrmProg.Move(.tlBanner.Left, .tlBanner.Height * 4, .ClientWidth - 8)
+ .tlCurrPkg.Move(4, 8, .FrmProg.Width - 8)
.pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.Height *
3, .tlCurrPkg.Width, 24)
END WITH
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Thu Jul 24 20:46:36 2008
@@ -4,11 +4,11 @@
MoveScaled(0,0,78,51)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(1,1,63,3)
+ MoveScaled(1,1,63,8)
Text = ("Vectorlinux is currently being installed to your
system... Please wait")
}
{ FrmProg Frame
- MoveScaled(1,10,76,19)
+ MoveScaled(1,10,76,34)
Text = ("")
{ tlCurrPkg TextLabel
MoveScaled(1,1,73,3)
@@ -22,7 +22,7 @@
MoveScaled(1,13,44,3)
}
{ tlCurrPkg2 TextLabel
- MoveScaled(1,9,45,3.1429)
+ MoveScaled(1,9,45,3)
Text = ("Total progress")
}
}
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Thu Jul 24 20:46:36 2008
@@ -187,7 +187,9 @@
-
+MdlCore.unlock_gui()
+fmain.btback.Enabled = FALSE
+fmain.btback.ForeColor = Color.Gray
END
@@ -519,5 +521,31 @@
END
+PUBLIC SUB LOCK_GUI()
+
+ WITH fmain
+ .btback.Enabled = FALSE
+ .btback.ForeColor = Color.Gray
+ .btnext.Enabled = FALSE
+ .btnext.ForeColor = Color.Gray
+ .btQuit.Enabled = FALSE
+ .btQuit.ForeColor = Color.Gray
+
+ END WITH
+
+END
+PUBLIC SUB unlock_gui()
+
+ WITH fmain
+ .btback.Enabled = TRUE
+ .btback.ForeColor = Color.Black
+ .btnext.Enabled = TRUE
+ .btnext.ForeColor = Color.Black
+ .btQuit.Enabled = TRUE
+ .btQuit.ForeColor = Color.Black
+
+ END WITH
+
+END
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 24 20:46:36 2008
@@ -185,7 +185,12 @@
'CATCH
'PRINT ERROR
'.RETURN 1
- RETURN 0
+ 'RETURN 0
+ IF ClsPkgSel.bCustom = TRUE THEN
+ ' perform custom install
+ ELSE
+ ME.PERFORM_FULL_INSTALL()
+ END IF
END
PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String
@@ -237,6 +242,13 @@
DIM ipct AS Float
DIM iMinpct AS Float = ".01"
DIM iMaxpct AS Float = ".99"
+
+ WITH FrmInstallSys
+ .Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
+ END WITH
+
+
+
ClsGlobal.sTargetMnt = "/mnt/target"
sFile = Split(File.Load(Temp$("SETUP.CONF")), "\n")
FOR i = 0 TO sFile.count - 1
@@ -254,15 +266,21 @@
' figure out the sizing and the progrss meter
SHELL "export gsize=$(df| grep " &
ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
'Message(CStr(sTargetSize))
- iTotalSize = CInt(sTargetSize) + CInt(sPakSize)
+ sTargetSize = Trim(CStr(sTargetSize))
+ sPakSize = Trim(CStr(sPakSize))
+' iTotalSize = CFloat(CInt(sTargetSize) + CInt(sPakSize))
'RETURN
FrmInstallSys.tlCurrPkg.Text = "Installing " &
sPakDesc & " ..."
FrmInstallSys.pbInstallProg.Value = 0.0
PRINT "Installing " & sPakDesc & " Total size (KB) = "
& CStr(sPakSize)
- hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " |
tar -xp -C " & ClsGlobal.sTargetMnt
- WAIT 1
+ sDump = ""
+ sErr = ""
+ MdlCore.LOCK_GUI()
+ hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " |
tar -xp -C " & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+
+ WAIT 2
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
@@ -292,6 +310,13 @@
UNTIL
hproc.State = Process.Stopped
+ ' error check
+ IF InStr(sDump, "FAILED") > 0 THEN
+ Message.Error("There has been an error
extracting " & sPakDesc & gb.NewLine &
+ "<b>ERROR</b>" & gb.NewLine &
+ sErr)
+ RETURN 1
+ END IF
END IF
PRINT sPak & " is installed... "
'PRINT "Needs to install " & sPak
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Thu Jul 24 20:46:36 2008
@@ -18,13 +18,84 @@
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
+
+ PUBLIC SUB PREPARE_ALL_PARTITIONS()
+
+ DIM sList AS String[]
+ DIM i, iretval AS Integer
+ DIM sPart, sFormat AS String
+
+ sList = NEW String[]
+
+ IF ClsPartSel.sRoot THEN
+ sList.Add(ClsPartSel.sRoot & ";" & ClsPartSel.fRoot)
+ END IF
+ IF ClsPartSel.sHome THEN
+ sList.Add(ClsPartSel.sHome & ";" & ClsPartSel.fHome)
+ END IF
+ IF ClsPartSel.sUsr THEN
+ sList.Add(ClsPartSel.sUsr & ";" & ClsPartSel.fUsr)
+ END IF
+ IF ClsPartSel.sOpt THEN
+ sList.Add(ClsPartSel.sOpt & ";" & ClsPartSel.fOpt)
+ END IF
+ IF ClsPartSel.sTmp THEN
+ sList.Add(ClsPartSel.sTmp & ";" & ClsPartSel.fTmp)
+ END IF
+ IF ClsPartSel.sVar THEN
+ sList.Add(ClsPartSel.sVar & ";" & ClsPartSel.fVar)
+ END IF
+
+ ' now that we have the list in the array, let's do each one
+ FOR i = 0 TO sList.Count - 1
+ sPart = Left(sList[i], InStr(sList[i], ";") - 1)
+ sFormat = Right(sList[i], Len(sList[i]) - InStr(sList[i], ";"))
+ iretval = MdlPartFrmt.FORMAT_PARTITION(sPart, sFormat) ' do the formatting
+ IF iretval <> 0 THEN
+ RETURN ' stop right there there's been an error.
+ END IF
+ NEXT
+
+
+ IF iretval AND iretval <> 0 THEN
+ ' there has been an error. Do not move from here
+ 'Message("Error formatting partitions")
+ FrmInstallSys.tlBanner.Text = "Error formatting partitions"
+ FrmInstallSys.BackColor = Color.Red
+ RETURN
+ ELSE
+ 'move on to installing.. first, make fstab
+ FrmInstallSys.tlBanner.Text = "Finished formatting partitions"
+ PRINT "Finished formatting partitions"
+ WAIT 3
+ WITH FrmInstallSys
+ .tlBanner.BackColor = Color.Default
+ .pbInstallProg.Visible = TRUE
+ .pbInstallProg2.Visible = TRUE
+ .tlCurrPkg2.Visible = TRUE
+ .FrmProg.Text = " Installing VectorLinux "
+ END WITH
+ MdlCore.LOCK_GUI()
+ MdlInstallSys.MOUNT_DEFINED_PARTITIONS() ' let the game begin
+
+ END IF
+
+END
+
+
+
PUBLIC FUNCTION FORMAT_PARTITION(sAddr AS String, sFS AS String) AS
Integer ' will return 1 for trouble, 0 for clear
DIM sCommand AS String
-
+ DIM sResult AS String
'Umount the volume first
- SHELL "umount " & sAddr WAIT
+ SHELL "mount | grep " & sAddr TO sResult
+ sResult = Trim(sResult)
+ IF sResult <> "" THEN
+
+ SHELL "umount " & sAddr WAIT
+ END IF
SELECT CASE LCase(sFS)
CASE "ext2"
sCommand = "mke2fs -q " & sAddr
@@ -37,12 +108,13 @@
CASE "jfs"
sCommand = "mkfs.jfs -q " & sAddr
END SELECT
-
- hproc = SHELL sCommand & " | echo \'FAILED\'" FOR READ
+ PRINT "Formatting " & sAddr & " to " & sFS
+ hproc = SHELL sCommand & " || echo \'FAILED\'" WAIT 'for read
WAIT
IF hproc.State = Process.Running THEN
REPEAT
- FrmHostPrep.tlStatus.Text = "Formatting " & sAddr & " as " & sFS
+ ' FrmHostPrep.tlStatus.Text = "Formatting " & sAddr & " as "
& sFS
+ FrmInstallSys.tlCurrPkg.Text = " Formatting " & sAddr & "
as " & sFS
WAIT
UNTIL
@@ -53,9 +125,13 @@
'error here
Message.Error("There has been an error wile trying to format " &
sAddr & " to " & sFS & gb.NewLine &
sErr)
- FrmHostPrep.tlStatus.Text = "Unable to format " & saddr
+ 'FrmHostPrep.tlStatus.Text = "Unable to format " & saddr
+ FrmInstallSys.tlCurrPkg.Text = "Unable to format " & sAddr
+ FrmInstallSys.tlBanner.BackColor = Color.Red
RETURN 1
ELSE
+ 'Message(" System is ready for VectorLinux")
+
RETURN 0
END IF
END IF
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Thu Jul 24 20:46:36 2008
@@ -293,7 +293,7 @@
IF sdropdwn.tag = LAST.tag THEN
sdropdwn.Text = "XFS"
'Balloon.Info("Select which filesystem to use with this
partition", sdropdwn)
- Balloon("Select which filesystem to use with this partition", sdropdwn)
+ ' Balloon("Select which filesystem to use with this partition", sdropdwn)
END IF
NEXT
|
|
From: <cod...@go...> - 2008-07-31 17:28:04
|
Author: M0E.lnx
Date: Thu Jul 24 18:23:50 2008
New Revision: 73
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/MdlInstallSys.module
Log:
Tweaked progressbar code to keep it from flunctuating
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/vluser/area-51/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/vluser/area-51/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /home/vluser/area-51/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# /home/vluser/area-51/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/vluser/area-51/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/vluser/area-51/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/vluser/area-51/projects/installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/vluser/area-51/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPkgSel.class
+# /home/vluser/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/area-51/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSummary.class
+# /home/vluser/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /home/vluser/area-51/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/vluser/area-51/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/area-51/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /home/vluser/area-51/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPkgSel.module
+# /home/vluser/area-51/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSummarize.module
+# /home/vluser/area-51/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Jul 24 18:23:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /home/vluser/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 24 18:23:50 2008
@@ -257,13 +257,15 @@
iTotalSize = CInt(sTargetSize) + CInt(sPakSize)
'RETURN
- FrmInstallSys.tlCurrPkg.Text = "Installing " & sPak
- PRINT "Installing " & sPakPath & " Total size (KB) = "
& CStr(sPakSize)
+ FrmInstallSys.tlCurrPkg.Text = "Installing " &
sPakDesc & " ..."
+ FrmInstallSys.pbInstallProg.Value = 0.0
+
+ PRINT "Installing " & sPakDesc & " Total size (KB) = "
& CStr(sPakSize)
hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " |
tar -xp -C " & ClsGlobal.sTargetMnt
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
- WAIT 1
+ WAIT 2
' get the actual size at each snap
SHELL "export gsize=$(df| grep " &
ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO iCurrSize
iCurrSize = Trim(CStr(iCurrSize))
@@ -284,7 +286,9 @@
'FrmInstallSys.pbInstallProg.Value =
(CInt(iCurrSize) / CInt(iTotalSize)) * 0.100
'PRINT CStr(iCurrSize) & "/" &
CStr(iTotalSize) & " = " & iVal & "%"
PRINT CStr(iCurrSize) & "/" &
CStr(iTotalSize) & " = " & iVal & "%"
- FrmInstallSys.pbInstallProg.Value = iVal
+ IF iVal >
FrmInstallSys.pbInstallProg.Value THEN
+ FrmInstallSys.pbInstallProg.Value = iVal
+ END IF
UNTIL
hproc.State = Process.Stopped
@@ -293,6 +297,7 @@
'PRINT "Needs to install " & sPak
END IF
NEXT
+ FrmInstallSys.tlBanner.Text = "Finished intalling Bulks"
END
|
14 messages has been excluded from this view by a project administrator.
