Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r76 - in branches/iVL: . .lang
|
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
|
