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-07-31 14:06:11
|
Author: uelsk8s
Date: Thu Jul 31 07:05:34 2008
New Revision: 90
Modified:
branches/iVL/MdlInstallSys.module
branches/iVL/MdlSetup.module
Log:
small code changes to fix errors on install system
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Jul 31 07:05:34 2008
@@ -28,9 +28,7 @@
' this is where we need to set the mount target
- 'ClsGlobal.sTargetMnt = "/mnt/target"
- 'ClsGlobal.sTargetMnt = "/mnt/target"
- ClsGlobal.sTargetMnt = "/home/moises/mnt/target" ' just for testing now.
+ ClsGlobal.sTargetMnt = "/mnt/target"
IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
END IF
@@ -39,12 +37,12 @@
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
'/DISABLED FOR TESTING INSTALL ONLY
- ' 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 " & LCase(ClsPartSel.fhome)
WAIT 'mount the home partition if defined
- '
- ' END IF
+ 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 " & LCase(ClsPartSel.fhome)
WAIT 'mount the home partition if defined
+
+ 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
@@ -203,19 +201,19 @@
'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()
+ ' 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 IF
END
PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String
@@ -245,8 +243,9 @@
DIM iret AS Integer
- ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
-
+ 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
@@ -294,7 +293,7 @@
' WRITE THE FSTAB NOW
MdlInstallSys.WRITE_NEW_FSTAB()
- Message.Info("Vectorlinux is now installed in your system. REboot
may be necessary")
+ Message.Info("Vectorlinux is now installed in your system. Please
Exit the installer")
@@ -320,13 +319,15 @@
arrFile = Split(sFile, "\n")
FOR i = 0 TO arrFile.Count - 1
sLine = Trim(arrFile[i])
- IF Left(sLine, Len("PACKAGE_NAME")) = "PACKAGE_NAME" THEN
+ 'WAIT 10
+ IF Left(sLine, Len("PACKAGE_NAME")) = "PACKAGE NAME" THEN
sPkgName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
'sPkgPath = Right(arrFile[
- sPkgPath = Right(arrFile[i + 1], Len(arrFile[i + 1]) -
InStr(arrFile[i + 1], ":"))
- vPgsSize = Trim(Right(arrFile[i + 3], Len(arrFile[i +
3]) - InStr(arrFile[i + 3], ":")) - 1)
+ 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)
' 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
ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName)
WAIT
IF hproc.State = Process.Running THEN
@@ -357,6 +358,7 @@
PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
DIM sRawList AS String
DIM sList AS String[]
+ DIM sCount AS String[]
DIM sTrimmed AS String
DIM sLineArr AS String[]
DIM sBulkPath AS String
@@ -364,16 +366,20 @@
DIM sBulkDesc AS String
DIM vTargetSize AS Variant
DIM i AS Integer
- DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF")
+ '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")
-
- ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
- sList = Split(sFile, "\n")
+ sList = Split(sRawList, "\n")
+ PRINT sRawList & "srawlist " & sList.Count
FOR i = 0 TO sList.count - 1
- sLine = Trim(sList[i])
- IF Left(sLine, Len("BULKX")) = "BULK" & "*[0-9]*" THEN
+ 'SHELL ". /mnt/cdrom/veclinux/SETUP.CONF && echo $BULK"
& i TO sList[i]
+ 'sLine = Trim(sList[i])
+ PRINT sList[i]
+ IF Left(sList[i], Len("BULK")) = "BULK" THEN
sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
sTrimmed = Left(sTrimmed, InStr(sTrimmed, "\'") - 1)
@@ -381,10 +387,13 @@
sBulkPath = sLineArr[0]
vBulkSize = sLineArr[1]
sBulkDesc = sLineArr[2]
+ PRINT sBulkPath & vBulkSize & sBulkDesc
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
-
- 'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
+ PRINT "installing " & sBulkPath
+ 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
IF hproc.State = Process.Running THEN
REPEAT
@@ -393,7 +402,7 @@
UNTIL
hproc.State = Process.Stopped
'error check
- END IF
+ END IF
END IF
NEXT
'RETURN
@@ -457,7 +466,7 @@
.Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
END WITH
iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
- 'Message.Info("Total packages = " & iPkgCnt)
+ Message.Info("Total packages = " & iPkgCnt)
'RETURN
' make sure the progress is revealed at the main window
WITH FMain
@@ -531,8 +540,8 @@
FrmInstallSys.tlBanner.Text = "Finished intalling Bulks"
' now to the packages individually
- FrmInstallSys.tlBanner.Text = "Installing additional software."
- ME.INSTALL_PACKAGES
+ ' FrmInstallSys.tlBanner.Text = "Installing additional software."
+ ' ME.INSTALL_PACKAGES
END
@@ -679,7 +688,7 @@
iCurrTlz = i
'hproc = SHELL "install-pkg " & sTlzPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- ME.PACKAGE_INSTALL(sTlzBasePath &/ sTlzPath)
+ ME.PACKAGE_INSTALL(sTlzPath)
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
@@ -715,36 +724,37 @@
PRINT "Installing final system configuration"
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF"
& " | grep ^CONF" TO sRawList
'Message.Info(sRawList)
- IF InStr(sRawList, "\n") THEN
- PRINT "Multiple config files found ... starting at the top
of the list"
-
- sList = Split(sRawList, "\n")
- FOR i = 0 TO sList.count - 1
- sCOnfLine = Trim(sList[i])
- IF Left(sCOnfLine, Len("CONF")) = "CONF" THEN
- sPkg = Right(sCOnfLine, Len(sCOnfLine) - InStr(sCOnfLine, "\'"))
- 'PRINT sPkg
- sLinarr = Split(sPkg, ":")
- sPkgPath = sLinarr[0]
-
- 'PRINT sPkgPath
- ' now install the packages
- INC iPkgNum
- ' This may need to be installed as a bulk
rather than a package
- 'hproc = SHELL "install-pkg " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sPkgPath & Space(1) & ClsGlobal.sTargetMnt & " || echo
\'FAILED\'" FOR READ
- ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sPkgPath)
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- WAIT 1
- IF hproc.State = Process.Running THEN
- REPEAT
- WAIT 2
- UNTIL
- hproc.State = Process.Stopped
-' INC iPkgNum
- END IF
- END IF
- NEXT
- ELSE ' only one line found
+ PRINT sRawList & " config"
+' IF InStr(sRawList, "\n") THEN
+' PRINT "Multiple config files found ... starting at the top
of the list"
+'
+' sList = Split(sRawList, "\n")
+' FOR i = 0 TO sList.count - 1
+' sCOnfLine = Trim(sList[i])
+' IF Left(sCOnfLine, Len("CONF")) = "CONF" THEN
+' sPkg = Right(sCOnfLine, Len(sCOnfLine) - InStr(sCOnfLine, "\'"))
+' 'PRINT sPkg
+' sLinarr = Split(sPkg, ":")
+' sPkgPath = sLinarr[0]
+'
+' 'PRINT sPkgPath
+' ' now install the packages
+' INC iPkgNum
+' ' This may need to be installed as a bulk
rather than a package
+' 'hproc = SHELL "install-pkg " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sPkgPath & Space(1) & ClsGlobal.sTargetMnt & " || echo
\'FAILED\'" FOR READ
+' ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux"
&/ sPkgPath)
+' FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+' WAIT 1
+' IF hproc.State = Process.Running THEN
+' REPEAT
+' WAIT 2
+' UNTIL
+' hproc.State = Process.Stopped
+' ' INC iPkgNum
+' END IF
+' END IF
+' NEXT
+' ELSE ' only one line found
PRINT "Found a single CONF package... Installing it now"
sRawList = Trim(sRawList)
sLinarr = Split(sRawList, ":")
@@ -752,7 +762,7 @@
' now install the package
INC iPkgNum
'hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- ME.BULK_INSTALL(sPkgPath)
+ ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sPkgPath)
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
WAIT 1
IF hproc.State = Process.Running THEN
@@ -762,7 +772,7 @@
hproc.State = Process.Stopped
' INC iPkgNum
END IF
- END IF
+ ' END IF
IF InStr(sDump, "FAILED") > 0 THEN
RETURN 1
ELSE
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Jul 31 07:05:34 2008
@@ -146,8 +146,11 @@
END
PUBLIC FUNCTION UPDATE_OVERALL_PROGRESS(iTotalPkgs AS Integer,
iCurrPkg AS Integer) AS Float
-
DIM fRet AS Float
+ ' IF iTotalPkgs = 0 THEN
+ ' iTotalPkgs = 10
+ ' ENDIF
+
fRet = iCurrPkg / iTotalPkgs
fRet = Round(fRet, -2)
RETURN fRet
@@ -166,31 +169,31 @@
' let's get a package count
IF bCustom = FALSE THEN ' DOING A FULL INSTALL
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF
| grep ^BULK" TO sDump
- sDump = Trim(sDump)
- sTotalList = sTotalList & sDump
- sTotalList = Trim(sTotalList)
- sDump = ""
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF
| grep ^CONF" TO sDump
- sTotalList = sTotalList & gb.NewLine & Trim(sDump)
- sDump = ""
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT | grep ^\"PACKAGE NAME\"" TO sDump
- sTotalList = sTotalList & gb.NewLine & Trim(sDump)
- sDump = ""
- SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sDump
- sTotalList = sTotalList & gb.NewLine & Trim(sDump)
- sDump = ""
- ' split the array
- sList = Split(sTotalList, "\n")
- FOR i = 0 TO sList.Count - 1
- IF sList[i] = "" THEN
- sList.Delete(i)
- END IF
- NEXT
- iQTY = sList.Count
-
+ ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF | grep ^BULK" TO sDump
+ ' sDump = Trim(sDump)
+ ' sTotalList = sTotalList & sDump
+ ' sTotalList = Trim(sTotalList)
+ ' sDump = ""
+ ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF | grep ^CONF" TO sDump
+ ' sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+ ' sDump = ""
+ ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT | grep ^\"PACKAGE NAME\"" TO sDump
+ ' sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+ ' sDump = ""
+ ' SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sDump
+ ' sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+ ' sDump = ""
+ ' ' split the array
+ ' sList = Split(sTotalList, "\n")
+ ' FOR i = 0 TO sList.Count - 1
+ ' IF sList[i] = "" THEN
+ ' sList.Delete(i)
+ ' END IF
+ ' NEXT
+ ' iQTY = sList.Count
+ SHELL "find /mnt/cdrom -name *.tlz|wc -l" TO iQTY
ELSE ' GOING FOR CUSTOM INSTALL
-
+
END IF
|
|
From: <cod...@go...> - 2008-07-30 22:01:08
|
Author: M0...@gm...
Date: Wed Jul 30 15:00:17 2008
New Revision: 89
Modified:
branches/iVL/FrmInstallSys.class
branches/iVL/MdlCore.module
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
Log:
- Modified function to search for ISO's in all partitions, not just linux.
- Re-routed install procedures to make sure fstab gets written after all
packages are installed
- Modified BULK installation function to use a gambas routine reading
SETUP.CONF to get the list of bulks to install rather than a shell
output.
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Wed Jul 30 15:00:17 2008
@@ -35,12 +35,13 @@
PUBLIC SUB Form_Open()
' prepare the system
+ ME.HIDE_PROGRES_CONTROLS()
ME.FrmProg.Text = " Preparing system for installation "
ME.tlCurrStepLbl.Text = "Current Step"
-ME.HIDE_PROGRES_CONTROLS()
+
ME.BEGIN_PROCESS()
END
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Wed Jul 30 15:00:17 2008
@@ -96,7 +96,7 @@
DIM sPartition AS String
'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \'
\'" TO sResults
- SHELL "/sbin/probepart | grep -e \" Linux$\" | cut -f 1 -d \' \' |
grep /dev" TO sResults
+ SHELL "/sbin/probepart | cut -f 1 -d \' \' | grep /dev" TO sResults
sResults = Trim(sResults)
'Message.Info(sResults)
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Wed Jul 30 15:00:17 2008
@@ -29,6 +29,13 @@
DIM iRet AS Integer = 0
+ WITH FMain
+ .tvPlan["Inst2"].Selected = TRUE
+ .tvPlan["Inst2"].Picture = MdlCore.sNowPic
+ .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ END WITH
+
+
ME.CALCULATE_TOTAL_PACKAGES()
'RETURN
@@ -74,6 +81,8 @@
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!")
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Wed Jul 30 15:00:17 2008
@@ -69,10 +69,16 @@
'WRITE THE NEW FSTAB NOW, RIGHT BEFORE INSTALLING PACKAGES.
- ME.WRITE_NEW_FSTAB() ' do this from the install form
+ 'ME.WRITE_NEW_FSTAB() ' do this from the install form
'redirect to packages install
'ME.INSTALL_PACKAGES()
-
+ ' FROM HERE, DECIDE WHICH WAY TO GO
+ IF ClsPkgSel.bCustom = TRUE THEN
+ MdlInstallCustom.PERFORM_CUSTOM_INSTALL
+ ELSE
+ MdlInstallSys.PERFORM_FULL_INSTALL()
+ END IF
+
@@ -92,13 +98,9 @@
DIM sFstab AS String
' make the changes show up on the steps now
- WITH FMain
- .tvPlan["Inst2"].Selected = TRUE
- .tvPlan["Inst2"].Picture = MdlCore.sNowPic
- .tvPlan["Inst1"].Picture = MdlCore.sDonePic
- END WITH
+
+
- ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"
@@ -239,8 +241,21 @@
END
PUBLIC SUB PERFORM_FULL_INSTALL()
+
DIM iret AS Integer
+
+ ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
+
+ WITH FMain
+ .tvPlan["Inst2"].Selected = TRUE
+ .tvPlan["Inst2"].Picture = MdlCore.sNowPic
+ .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ END WITH
+
+
+
+
PRINT "Installing bulks"
MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = ME.INSTALL_BULK_PACKAGES()
@@ -276,6 +291,9 @@
PRINT "Error installing kernels ... exit "
RETURN
END IF
+
+ ' WRITE THE FSTAB NOW
+ MdlInstallSys.WRITE_NEW_FSTAB()
Message.Info("Vectorlinux is now installed in your system. REboot
may be necessary")
@@ -346,20 +364,27 @@
DIM sBulkDesc AS String
DIM vTargetSize AS Variant
DIM i AS Integer
+ DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF")
+ DIM sLine AS String
+
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
- sList = Split(sRawList, "\n")
+ ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
+ sList = Split(sFile, "\n")
FOR i = 0 TO sList.count - 1
+ sLine = Trim(sList[i])
+ IF Left(sLine, Len("BULKX")) = "BULK" & "*[0-9]*" THEN
+
sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
sTrimmed = Left(sTrimmed, InStr(sTrimmed, "\'") - 1)
sLineArr = Split(sTrimmed, ":")
sBulkPath = sLineArr[0]
vBulkSize = sLineArr[1]
sBulkDesc = sLineArr[2]
+
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
- ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
+ 'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
@@ -369,9 +394,9 @@
hproc.State = Process.Stopped
'error check
END IF
-
+ END IF
NEXT
-
+'RETURN
IF InStr(sDump, "FAILED") > 0 THEN
RETURN 1
ELSE
|
|
From: <cod...@go...> - 2008-07-28 21:55:26
|
Author: M0...@gm...
Date: Mon Jul 28 14:54:49 2008
New Revision: 88
Added:
branches/iVL/install-pkg (contents, props changed)
Modified:
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartFrmt.module
Log:
minor changes to the full install procedure
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Mon Jul 28 14:54:49 2008
@@ -29,7 +29,8 @@
' this is where we need to set the mount target
'ClsGlobal.sTargetMnt = "/mnt/target"
- ClsGlobal.sTargetMnt = "/mnt/target" ' just for testing now.
+ 'ClsGlobal.sTargetMnt = "/mnt/target"
+ ClsGlobal.sTargetMnt = "/home/moises/mnt/target" ' just for testing now.
IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
END IF
@@ -38,12 +39,12 @@
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
'/DISABLED FOR TESTING INSTALL ONLY
- 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 " & LCase(ClsPartSel.fhome)
WAIT 'mount the home partition if defined
-
- END IF
+ ' 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 " & LCase(ClsPartSel.fhome)
WAIT 'mount the home partition if defined
+ '
+ ' 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
@@ -240,26 +241,36 @@
PUBLIC SUB PERFORM_FULL_INSTALL()
DIM iret AS Integer
+ PRINT "Installing bulks"
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = ME.INSTALL_BULK_PACKAGES()
IF iret <> 0 THEN
PRINT "Error installing bulks ... exit"
RETURN
END IF
+ PRINT "installing packages"
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = ME.INSTALL_PACKAGES_NEW()
IF iret <> 0 THEN
PRINT "error installing packages ... exit"
RETURN
END IF
+ PRINT "Installing packages/required"
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = ME.INSTALL_REQUIRED_PACKAGES()
IF iret <> 0 THEN
PRINT "Error installing packages/required ... exit"
RETURN
END IF
+ PRINT "installing CONFIG packages from SETUP.CONF"
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = ME.INSTALL_CONFIG_PACKAGES()
IF iret <> 0 THEN
PRINT "Error installing config packages ... exit"
RETURN
END IF
+ PRINT "installing kernels"
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = MdlInstallCustom.INSTALL_KERNELS()
IF iret <> 0 THEN
PRINT "Error installing kernels ... exit "
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Mon Jul 28 14:54:49 2008
@@ -30,8 +30,10 @@
FOR EACH cb IN MdlPartSel.oFsTypes
sPart = cb.Tag
sFormat = cb.Text
+ IF cb.text <> "Do not format" THEN
PRINT " Formatting " & sPart & " to " & sFormat
ME.FORMAT_PARTITION(sPart, sFormat)
+ END IF
NEXT
PRINT "Partition formatting complete"
Added: branches/iVL/install-pkg
==============================================================================
--- (empty file)
+++ branches/iVL/install-pkg Mon Jul 28 14:54:49 2008
@@ -0,0 +1,146 @@
+#!/bin/sh
+# This code was captured from installpkg, Slackware 10, By Patric V.
+# Modified by Eko M. Budi to suit old isolinux
+# - exclude directory that will overwrite symlink
+# - get the FILE LIST from previous check
+# - capable to handle tgz, tbz, tlz
+#
+
+if [ -z "$1" ]; then
+ echo "Usage: install-pkg <package> [ROOT]"
+ exit 1
+fi
+
+package=$1
+ROOT=${ROOT:-/}
+[ "$2" ] && ROOT=$2
+ADM_DIR=$ROOT/var/log
+TMP=$ROOT/tmp
+
+mkdir -p $ADM_DIR/packages
+mkdir -p $ADM_DIR/scripts
+mkdir -p $TMP
+
+echo HO
+
+longname=`basename $package`
+packagetype=${longname##*.}
+shortname=${longname%.*}
+packagebase=`pkgname $longname`
+
+# Test tarball integrity, store the list
+rm -f $TMP/tmplist
+case $packagetype in
+ tlz)
+ lzmadec <$package | /bin/tar-1.13-pkgtools -t >$TMP/tmplist 2>/dev/null
+ ;;
+ tbz|tbz2)
+ tar -tj <$package >$TMP/tmplist 2>/dev/null
+ ;;
+ tgz)
+ tar -tz <$package >$TMP/tmplist 2>/dev/null
+ ;;
+esac
+
+TARERROR=$?
+if [ ! "$TARERROR" = "0" ]; then
+ echo "Package $package is corrupted" >> $flog
+ rm -f $TMP/tmplist
+ return 1
+fi
+
+echo HU
+
+# make sure we're not installing files on top of existing symbolic links
+# and exclude the directories that are a symlink
+# big change, by Eko M. Budi
+rm -f $TMP/exclist
+rm -f $TMP/rmvlist
+cat $TMP/tmplist | while read file ; do
+ if [ -d $ROOT/${file%/} ]; then
+ echo "$file: DIR"
+ if [ -L $ROOT/${file%/} ]; then
+ echo $file >> $TMP/exclist
+ fi
+ elif [ -L "$ROOT/$file" ] ; then
+ echo "$file: SYMLINK"
+ echo $file >> $TMP/rmvlist
+ rm -f "$ROOT/$file"
+ else
+ echo "$file: FILE"
+ fi
+done
+
+echo HI
+
+
+# Extract
+if [ -f $TMP/exclist ]; then
+ EXCLUDED="-X $TMP/exclist"
+else
+ EXCLUDED=""
+fi
+
+case $packagetype in
+ tlz)
+ lzmadec <$package | /bin/tar-1.13-pkgtools -C $ROOT -xlUpv >$TMP/$shortnam
+e 2>/dev/null
+ ;;
+ tbz|tbz2)
+ tar $EXCLUDED -C $ROOT -xjlUpv <$package >$TMP/$shortname 2>/dev/null
+ ;;
+ tgz)
+ tar $EXCLUDED -C $ROOT -xzlUpv <$package >$TMP/$shortname 2>/dev/null
+ ;;
+esac
+
+rm -f $TMP/exclist
+rm -f $TMP/tmplist
+
+# Write the package file database entry and install the package
+echo "PACKAGE NAME: $shortname" > $ADM_DIR/packages/$shortname
+echo "COMPRESSED PACKAGE SIZE: $COMPRESSED" >> $ADM_DIR/packages/$shortname
+echo "UNCOMPRESSED PACKAGE SIZE: $UNCOMPRESSED" >> $ADM_DIR/packages/$shortname
+echo "PACKAGE LOCATION: $package" >> $ADM_DIR/packages/$shortname
+echo "PACKAGE DESCRIPTION:" >> $ADM_DIR/packages/$shortname
+
+# add dependency info
+# big change, by kocil
+if [ -r $ROOT/install/slack-required ]; then
+ grep -ve '^#' $ROOT/install/slack-required | while read LINE; do
+ echo "REQUIRED: $LINE" >> $ADM_DIR/packages/$shortname 2> /dev/null
+ done
+fi
+
+if [ -r $ROOT/install/slack-desc ]; then
+ cat $ROOT/install/slack-desc | grep "^$packagebase:" >> $ADM_DIR/packages/$s
+hortname 2> /dev/null
+ if [ "$shortname" != "$packagebase" ]; then
+ cat $ROOT/install/slack-desc | grep "^$shortname:" >> $ADM_DIR/packages/$s
+hortname 2> /dev/null
+ fi
+fi
+
+echo "FILE LIST:" >> $ADM_DIR/packages/$shortname
+if [ "`cat $TMP/$shortname | grep '^./' | wc -l | tr -d ' '`" = "1" ]; then
+ # Good. We have a package that meets the Slackware spec.
+ cat $TMP/$shortname >> $ADM_DIR/packages/$shortname
+else
+ # 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
+fi
+
+if [ -f $ROOT/install/doinst.sh ]; then
+ echo "Executing install script for $shortname..."
+ (cd $ROOT; sh install/doinst.sh -install)
+ cp $ROOT/install/doinst.sh $ADM_DIR/scripts/$shortname
+ chmod 755 $ADM_DIR/scripts/$shortname
+fi
+
+# Clean up the mess...
+rm -f $TMP/$shortname
+rm -rf $ROOT/install
+exit 0
|
|
From: <cod...@go...> - 2008-07-28 16:19:48
|
Author: M0...@gm...
Date: Mon Jul 28 09:19:04 2008
New Revision: 87
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
branches/iVL/MdlPartSel.module
Log:
- Fixed bug in partition selector window
- Broke down the full isntall function to make it into separate sections
This will allow error checking and modularity.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Mon Jul 28 09:19:04 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/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 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/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 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 Mon Jul 28 09:19:04 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/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 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/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 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/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Mon Jul 28 09:19:04 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlWinDrives.module
+# /home/moises/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 Mon Jul 28 09:19:04 2008
@@ -97,6 +97,7 @@
.tvPlan["Inst1"].Picture = MdlCore.sDonePic
END WITH
+ ClsGlobal.sTargetMnt = "/home/moises/mnt/target"
FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"
@@ -185,9 +186,9 @@
'Message(sFstab)
- IF NOT ClsGlobal.sTargetMnt OR ClsGlobal.sTargetMnt = "" THEN
- ClsGlobal.sTargetMnt = "/mnt/target"
- END IF
+ ' 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
@@ -210,6 +211,7 @@
'FrmInstallSys.tlCurrPkg.Text = "Installing Additional
software... Please wait"
'ME.INSTALL_REQUIRED_PACKAGES()
'ME.INSTALL_PACKAGES()
+
END IF
END
@@ -235,8 +237,162 @@
END
+PUBLIC SUB PERFORM_FULL_INSTALL()
+
+ DIM iret AS Integer
+ iret = ME.INSTALL_BULK_PACKAGES()
+ IF iret <> 0 THEN
+ PRINT "Error installing bulks ... exit"
+ RETURN
+ END IF
+ iret = ME.INSTALL_PACKAGES_NEW()
+ IF iret <> 0 THEN
+ PRINT "error installing packages ... exit"
+ RETURN
+ END IF
+ iret = ME.INSTALL_REQUIRED_PACKAGES()
+ IF iret <> 0 THEN
+ PRINT "Error installing packages/required ... exit"
+ RETURN
+ END IF
+ iret = ME.INSTALL_CONFIG_PACKAGES()
+ IF iret <> 0 THEN
+ PRINT "Error installing config packages ... exit"
+ RETURN
+ END IF
+ iret = MdlInstallCustom.INSTALL_KERNELS()
+ IF iret <> 0 THEN
+ PRINT "Error installing kernels ... exit "
+ RETURN
+ END IF
+ Message.Info("Vectorlinux is now installed in your system. REboot
may be necessary")
+
+
+
+
+END
+
+
+
+
-PUBLIC SUB PERFORM_FULL_INSTALL() AS Integer
+PUBLIC FUNCTION INSTALL_PACKAGES_NEW() AS Integer
+
+ DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT")
+ DIM arrFile AS String[]
+ DIM i AS Integer
+ DIM sLine AS String
+ DIM vPgsSize AS Variant
+ DIM sPkgPath AS String
+ DIM sPkgName AS String
+ DIM vTargetSize AS Variant
+
+
+ arrFile = Split(sFile, "\n")
+ FOR i = 0 TO arrFile.Count - 1
+ sLine = Trim(arrFile[i])
+ IF Left(sLine, Len("PACKAGE_NAME")) = "PACKAGE_NAME" THEN
+ sPkgName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
+ 'sPkgPath = Right(arrFile[
+ sPkgPath = Right(arrFile[i + 1], Len(arrFile[i + 1]) -
InStr(arrFile[i + 1], ":"))
+ vPgsSize = Trim(Right(arrFile[i + 3], Len(arrFile[i +
3]) - InStr(arrFile[i + 3], ":")) - 1)
+ ' now install the package
+ SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot
& " ) && echo $gsize | cut -f3 -d \' \'" TO vTargetSize
+ ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName)
+ WAIT
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT 3
+ ' update progree here
+
ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vPgsSize))
+ UNTIL
+ hproc.State = Process.Stopped
+ END IF
+
+ END IF
+ NEXT
+ ' error check
+ IF InStr(sDump, "FAILED") > 0 THEN
+ PRINT sPkgName & " failed to install "
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
+END
+
+
+
+
+
+
+PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
+ DIM sRawList AS String
+ DIM sList AS String[]
+ DIM sTrimmed AS String
+ DIM sLineArr AS String[]
+ DIM sBulkPath AS String
+ DIM vBulkSize AS Variant
+ DIM sBulkDesc AS String
+ DIM vTargetSize AS Variant
+ DIM i AS Integer
+
+
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
+ sList = Split(sRawList, "\n")
+ FOR i = 0 TO sList.count - 1
+ sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
+ sTrimmed = Left(sTrimmed, InStr(sTrimmed, "\'") - 1)
+ sLineArr = Split(sTrimmed, ":")
+ sBulkPath = sLineArr[0]
+ vBulkSize = sLineArr[1]
+ sBulkDesc = sLineArr[2]
+ SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
+
+ ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulkPath)
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT 3
+ ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vBulkSize))
+ UNTIL
+ hproc.State = Process.Stopped
+ 'error check
+ END IF
+
+ NEXT
+
+ IF InStr(sDump, "FAILED") > 0 THEN
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
+
+END
+
+
+PUBLIC SUB BULK_INSTALL(sPath_to_bulk AS String)
+ sDump = ""
+ sErr = ""
+
+ 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
+
+
+END
+
+
+
+
+PUBLIC SUB PERFORM_FULL_INSTALL_OLD() AS Integer
'Will need to read SETUP.CONF to determine what to do here
@@ -476,8 +632,8 @@
' now install the package with the information we already have
PRINT sTlzName & sTlzPath
- sDump = ""
- sErr = ""
+ 'sDump = ""
+ 'sErr = ""
FrmInstallSys.tlCurrPkg.Text = "Installing " &
File.Name(sTlzPath) & " ..."
'FrmInstallSys.pbInstallProg.Value = 0.0
@@ -485,24 +641,32 @@
' for this one we will need to count the
packages, and base our progress on the number of packages
' installed vs the total number of packags
iCurrTlz = i
- FrmInstallSys.pbInstallProg.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iTlzTotal, iCurrTlz)
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- hproc = SHELL "install-pkg " & sTlzPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+
+ 'hproc = SHELL "install-pkg " & sTlzPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ ME.PACKAGE_INSTALL(sTlzBasePath &/ sTlzPath)
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
+
+ FrmInstallSys.pbInstallProg.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iTlzTotal, iCurrTlz)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
UNTIL
hproc.State = Process.Stopped
' INC iPkgNum
END IF
NEXT
- ME.INSTALL_CONFIG_PACKAGES()
+ IF InStr(sDump, "FAILED") > 0 THEN
+ PRINT "Error installing packages/required"
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
END
-PUBLIC SUB INSTALL_CONFIG_PACKAGES()
+PUBLIC FUNCTION INSTALL_CONFIG_PACKAGES() AS Integer
DIM sList AS String[]
DIM sLinarr AS String[]
DIM sRawList AS String
@@ -530,7 +694,9 @@
'PRINT sPkgPath
' now install the packages
INC iPkgNum
- hproc = SHELL "install-pkg " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sPkgPath & Space(1) & ClsGlobal.sTargetMnt & " || echo
\'FAILED\'" FOR READ
+ ' This may need to be installed as a bulk
rather than a package
+ 'hproc = SHELL "install-pkg " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sPkgPath & Space(1) & ClsGlobal.sTargetMnt & " || echo
\'FAILED\'" FOR READ
+ ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sPkgPath)
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
WAIT 1
IF hproc.State = Process.Running THEN
@@ -549,7 +715,8 @@
sPkgPath = Right(sLinarr[0], Len(sLinarr[0]) - InStr(sLinarr[0], "\'"))
' now install the package
INC iPkgNum
- hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ 'hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ ME.BULK_INSTALL(sPkgPath)
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
WAIT 1
IF hproc.State = Process.Running THEN
@@ -560,6 +727,11 @@
' INC iPkgNum
END IF
END IF
+ IF InStr(sDump, "FAILED") > 0 THEN
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
END
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Mon Jul 28 09:19:04 2008
@@ -203,10 +203,10 @@
spart = Trim(sSwapList)
'SHELL "export " & sSwapList & "=$(df -h | grep -i swap) |
cut -f 2 -d \' \'" TO vSwapSize
SHELL " export sw=$(probepart | grep -i \" *swap$\") && echo
$sw | cut -f 4 -d \' \'" TO vSwapSize
- Message(CStr(vSwapSize))
+ 'Message(CStr(vSwapSize))
IF vSwapSize <> "" THEN
'vSwapSize = Trim(CStr(vSwapSize))
- Message.Info(vSwapSize)
+ 'Message.Info(vSwapSize)
iswapsize = CInt(vSwapSize)
iswapsize = Round(iswapsize / 1024 / 1024, -2)
@@ -268,21 +268,34 @@
'DIM sTag AS String = LAST.tag
'DIM sText AS String = Trim(LAST.text)
-
+ FOR EACH sdropdwn IN oFsTypes
+ IF sdropdwn.tag = LAST.tag THEN
+ sdropdwn.Enabled = TRUE
+ IF sdropdwn.Find("Swap") <> -1 THEN
+ sdropdwn.Remove(sdropdwn.Find("Swap"))
+ END IF
+ sdropdwn.Text = "Do not format"
+ END IF
+ NEXT
SELECT CASE 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)
'Message("Swap Flag")
@@ -292,12 +305,16 @@
sdropdwn.Text = "Swap"
sdropdwn.Enabled = FALSE
ELSE
- sdropdwn.Enabled = TRUE
- IF sdropdwn.Find("Swap") <> -1 THEN
+ IF sdropdwn.Text <> "Do not format" AND
sdropdwn.Enabled = TRUE THEN
+ sdropdwn.Enabled = TRUE
+ END IF
+ IF sdropdwn.Find("Swap") <> -1 THEN
sdropdwn.Remove(sdropdwn.Find("Swap"))
END IF
+
END IF
NEXT
+
END SELECT
|
|
From: <cod...@go...> - 2008-07-28 02:35:03
|
Author: uelsk8s
Date: Sun Jul 27 19:34:51 2008
New Revision: 86
Added:
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlConfXorg.module
Log:
added rough start to lilo module
Added: branches/iVL/FrmLilo.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmLilo.class Sun Jul 27 19:34:51 2008
@@ -0,0 +1,2 @@
+' Gambas class file
+
Added: branches/iVL/FrmLilo.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmLilo.form Sun Jul 27 19:34:51 2008
@@ -0,0 +1,35 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,63,41)
+ Text = ("")
+ FullScreen = True
+ { tlBanner TextLabel
+ MoveScaled(0,0,58,4.5455)
+ Text = ("Configure and install lilo (Linux Boot Loader)")
+ }
+ { LiloTarget ComboBox
+ MoveScaled(1,11,45,3.2727)
+ Text = ("")
+ ReadOnly = True
+ List = [("MBR"), ("Sector"), ("Floppy")]
+ }
+ { YNLiloBox CheckBox
+ MoveScaled(1,5,18,3)
+ Text = ("Don't Install Lilo")
+ }
+ { FBResolution ComboBox
+ MoveScaled(1,18,45,3.2727)
+ Text = ("No installable images found.")
+ ReadOnly = True
+ List = [("Standard"), ("Bootsplash High"), ("Bootsplash Med"),
("Bootsplash Extra high")]
+ }
+ { LiloAppendBox TextBox
+ MoveScaled(1,27,45,3)
+ Text = ("")
+ }
+ { tlBanner2 TextLabel
+ MoveScaled(1,23,58,3)
+ Text = ("Lilo optional parameters: You may add any lilo boot
options here. ")
+ }
+}
Added: branches/iVL/MdlConfLilo.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlConfLilo.module Sun Jul 27 19:34:51 2008
@@ -0,0 +1,166 @@
+' 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/>.
+
+
+
+' PUBLIC Vmlinuz AS Object[]
+'
+' PUBLIC SUB LIST_BULK_SELECTION()
+'
+' DIM cb AS CheckBox
+' DIM i, ii, cby AS Integer
+' DIM sFIle AS String[]
+' DIM sCurrLine AS String[]
+' DIM sLine, sPkg, sDesc AS String
+' DIM vsize AS Variant
+' DIM isize AS Integer
+'
+' cby = 4
+'
+' Vmlinuz = NEW Object[]
+'
+' sFIle = Split(File.Load(Temp("SETUP.CONF")), gb.NewLine)
+' FOR i = 0 TO sFIle.count - 1
+' sLine = Trim(sFIle[i])
+' IF Left(sLine, Len("BULK")) = "BULK" THEN
+' sCurrLine = Split(sLine, ":")
+' 'line format is File_name.tlz:Size_kb:Description
+' sPkg = sCurrLine[0]
+' sDesc = sCurrLine[2]
+' vsize = sCurrLine[1]
+' IF InStr(sDesc, "\'") THEN
+' sDesc = Left(sDesc, Len(sDesc) - 1)
+' END IF
+' IF InStr(sPkg, "optional/") THEN
+'
+' cb = NEW CheckBox(FrmPkgSel.scrlInstallOpts) AS "Linux "
+' WITH cb
+' .Text = sDesc & Space(1) & "[ " & CStr(vsize)
& " KB ]"
+' .Width = MdlObjSizer.get_object_width(.Text) + 24
+' .x = 4
+' .y = cby
+' .Height = 27
+' .Tag = Right(sPkg, Len(sPkg) - InStr(sPkg, "=")
- 1)
+' .Value = TRUE
+' END WITH
+' ME.Vmlinuz.Add(cb)
+' cby = cby + cb.Height + 4
+' END IF
+' END IF
+' NEXT
+'
+' END
+'
+' PUBLIC FUNCTION WRITE_LILOCONF() AS Integer
+'
+' DIM sEntry AS String
+' DIM sPartition AS String
+' DIM sMountPoint AS String
+' DIM sMntOpts AS String
+' DIM i AS Integer
+' DIM sWinPart AS String
+' DIM sLilo AS String
+'
+' FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/lilo.conf to system"
+'
+' sLilo = "# LILO configuration file" &
+' "#generated by vliloconf" &
+' "#" &
+' "#Start LILO global section" &
+'
+' sLilo = sLilo & gb.NewLine &
+' "boot = " & $LILO_TARGET
+' "DEFAULT = linux"
+' "prompt" &
+' "timeout = 100" &
+' "#Override dangerous defaults that rewrite the partition table:" &
+' "change - rules" &
+' " reset" &
+' "compact" &
+' "bitmap = /boot/bitmap/boot.bmp" &
+'
+'
+' ClsPartSel.sRoot & " / " & LCase(ClsPartSel.fRoot) & " " &
ME.fS_oPTIONS(LCase(ClsPartSel.fRoot)) & " 0 1" & gb.NewLine
+'
+' IF ClsPartSel.sTmp THEN
+' sFstab = sFstab & gb.NewLine & ClsPartSel.sTmp & " /tmp " &
LCase(ClsPartSel.fTmp) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fTmp))
& " 0 2 "
+' END IF
+'
+' sLilo = sLilo & "\n\n" &
+' "#VESA framebuffer console @ $CONSOLETYPE" &
+' "vga = $CONSOLENUM" &
+' "#Normal VGA console" &
+' "#vga = normal" &
+' "#VESA framebuffer console @ 1024 x768x64k" &
+' "#vga = 791" &
+' "#VESA framebuffer console @ 1024 x768x32k" &
+' "#vga = 790" &
+' "#VESA framebuffer console @ 1024 x768x256" &
+' "#vga = 773" &
+' "#VESA framebuffer console @ 800 x600x64k" &
+' "#vga = 788" &
+' "#VESA framebuffer console @ 800 x600x32k" &
+' "#vga = 787" &
+' "#VESA framebuffer console @ 800 x600x256" &
+' "#vga = 771" &
+' "#VESA framebuffer console @ 640 x480x64k" &
+' "#vga = 785" &
+' "#VESA framebuffer console @ 640 x480x32k" &
+' "#vga = 784" &
+' "#VESA framebuffer console @ 640 x480x256" &
+' "#vga = 769" &
+' "# END LILO global section" &
+'
+'
+' sLilo = sLilo & "\n"
+'
+' 'Message(sLilo)
+'
+' 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" &/ "lilo.conf", SConv(sLilo))
+' 'CATCH
+' 'PRINT ERROR
+' '.RETURN 1
+' 'RETURN 0
+'
+' PUBLIC FUNCTION fFind_WIN() AS String
+' 'PARTS = SHELL "fdisk-l | grep -E '^/dev/.* \* .*(FAT32|HPFS|NTFS|
Win)' | cut -f 1 -d ' '"
+' index = ""
+' FOR PART IN $PARTS; DO
+' let count1 = count1 + 1
+' LILO1_PART[$count1] = "$PART"
+' LILO1_LABEL[$count1] = "Win$index"
+' LILO1_DESC[$count1] = "Windows ($PART)"
+' IF ["$index"]; THEN
+' let index = $index + 1
+' ELSE
+' index = 1
+' fi
+' done
+'
+' ENDIF
+'
+'
+' END
Added: branches/iVL/MdlConfXorg.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlConfXorg.module Sun Jul 27 19:34:51 2008
@@ -0,0 +1,18 @@
+' 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/>.
+
+
|
|
From: <cod...@go...> - 2008-07-27 23:39:38
|
Author: M0E.lnx Date: Sun Jul 27 16:39:25 2008 New Revision: 85 Added: branches/iVL/MdlInstallCustom.module Modified: branches/iVL/.lang/#project.pot branches/iVL/MdlCore.module branches/iVL/MdlInstallSys.module branches/iVL/MdlPartFrmt.module branches/iVL/MdlPkgSel.module branches/iVL/Order Log: - Added module to make the custom install happen. - Found and squashed bug in partition formatting procedure. All partitions were getting formatted to xfs and swap was not being created/activated. - Added function to install kernel (may need review) Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Sun Jul 27 16:39:25 2008 @@ -1,4 +1,4 @@ -# /root/new-install/.project +# /root/gui-installer/.project # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/MdlCore.module ============================================================================== --- branches/iVL/MdlCore.module (original) +++ branches/iVL/MdlCore.module Sun Jul 27 16:39:25 2008 @@ -200,6 +200,8 @@ PUBLIC SUB main() +'MdlInstallCustom.INSTALL_KERNELS() +'RETURN FMain.Show ' FMain.Maximized = TRUE ' FMain.Resize(Desktop.Width, Desktop.Height) Added: branches/iVL/MdlInstallCustom.module ============================================================================== --- (empty file) +++ branches/iVL/MdlInstallCustom.module Sun Jul 27 16:39:25 2008 @@ -0,0 +1,426 @@ +' 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/>. + + +' needs to read arrays from clsPkgsel and install all required packages +PRIVATE hproc AS Process +PRIVATE sDump AS String +PRIVATE sErr AS String +PRIVATE iPkgCnt AS Integer +PRIVATE iPkgNum AS Integer + + +PUBLIC SUB PERFORM_CUSTOM_INSTALL() + + DIM iRet AS Integer = 0 + + 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 + + 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 + ' Installation complete.... + Message("Vectorlinux is now installed on your system . Enjoy!") + + + +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" + 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 + + +PUBLIC FUNCTION INSTALL_CONF_PACKAGES() AS Integer + + DIM sOutput, sLine, sPkg, sPkgPath AS String + 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, Len(sPkg) - RInStr(sPkg, "\'")) + sLinearr = Split(sPkg, ":") + sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0] + ' install it now + PRINT " + Install " & sPkgPath + iret = ME.INSTALL_THIS_PACKAGE(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, Len(sPkg) - RInStr(sPkg, "\'")) + sLinearr = Split(sPkg, ":") + sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0] + iret = ME.INSTALL_THIS_PACKAGE(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 + + +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 + + +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) + 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[] + + '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 + DIM sList AS String[] + DIM sLine AS String[] + DIM i AS Integer + DIM sBulk AS String + DIM sTrimmed AS String + 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) + + 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_PACKAGE(sPackagePath AS String) AS Integer + DIM vSize AS Variant + DIM vTargetSize AS Variant + + 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) + 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(vTargetSize)) + 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 +END + + +PUBLIC SUB Process_read() + + DIM sLine AS String + READ #LAST, sLine, -256 + sDump = sDump & gb.NewLine & sLine + PRINT sLine + + +END + +PUBLIC SUB process_error(msg AS String) + + sErr = sErr & gb.NewLine & sErr + PRINT MSG +END + Modified: branches/iVL/MdlInstallSys.module ============================================================================== --- branches/iVL/MdlInstallSys.module (original) +++ branches/iVL/MdlInstallSys.module Sun Jul 27 16:39:25 2008 @@ -201,6 +201,7 @@ '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() Modified: branches/iVL/MdlPartFrmt.module ============================================================================== --- branches/iVL/MdlPartFrmt.module (original) +++ branches/iVL/MdlPartFrmt.module Sun Jul 27 16:39:25 2008 @@ -24,64 +24,21 @@ DIM sList AS String[] DIM i, iretval AS Integer DIM sPart, sFormat AS String + DIM cb AS ComboBox - 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 - FrmInstallSys.tlBanner.Text = "Formatting partitions" - ' 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], ";")) - FrmInstallSys.tlBanner.Text = "Formatting " & sPart & " with " & sFormat - WAIT 1 - 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 - + ' maybe a better approach to this + FOR EACH cb IN MdlPartSel.oFsTypes + sPart = cb.Tag + sFormat = cb.Text + PRINT " Formatting " & sPart & " to " & sFormat + ME.FORMAT_PARTITION(sPart, sFormat) + NEXT + PRINT "Partition formatting complete" - 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 - frminstallsys.tlBanner.Text = "Vectorlinux is now installing ... Please wait." MdlCore.LOCK_GUI() MdlInstallSys.MOUNT_DEFINED_PARTITIONS() ' let the game begin - END IF +' ' ' END IF 'MdlInstallSys.MOUNT_DEFINED_PARTITIONS END @@ -118,7 +75,7 @@ CASE "jfs" sCommand = "mkfs.jfs -q " & sAddr CASE "swap" - sCommand = "mkswap " & sAddr + sCommand = "mkswap -L swap-space " & sAddr END SELECT ' fix the form Modified: branches/iVL/MdlPkgSel.module ============================================================================== --- branches/iVL/MdlPkgSel.module (original) +++ branches/iVL/MdlPkgSel.module Sun Jul 27 16:39:25 2008 @@ -146,22 +146,7 @@ ClsPkgSel.arrBulks.Add(cb.tag) END IF NEXT ' just store them to the array for now. We will read the array at install time - - ' ' FOR i = 0 TO ClsPkgSel.arrBulks.count - 1 - ' ' sItem = ClsPkgSel.arrBulks[i] - ' ' IF sItem LIKE " " THEN - ' ' ClsPkgSel.arrBulks.Delete(ClsPkgSel.arrBulks.Find(sItem)) - ' ' ELSE - ' ' sList = sList & ", " & sItem - ' ' ENDIF - ' ' NEXT - ' ' IF Left(sList) = "," THEN - ' ' sList = Right(sList, Len(sList) - 1) - ' ' ELSE IF Right(sList) = "," THEN - ' ' sList = Left(sList, Len(sList) - 1) - ' ' END IF - ' ' sList = Trim(sList) - ' ' + END Modified: branches/iVL/Order ============================================================================== --- branches/iVL/Order (original) +++ branches/iVL/Order Sun Jul 27 16:39:25 2008 @@ -13,4 +13,15 @@ + 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 + + + Required bulkd + optional (selected) bulks + optional (selected) from PACKAGES.TXT + packages/required + CONF from SETUP.CONF + Kernel (below) + + + + + need to copy SOURCE_MNT_POINT/isolinux/kernel/sata to TARGET_MNT_POINT/boot/vmlinuz-2.6.25.7 \ No newline at end of file |
|
From: <cod...@go...> - 2008-07-27 03:55:35
|
Author: M0E.lnx
Date: Sat Jul 26 20:55:05 2008
New Revision: 84
Modified:
branches/iVL/MdlInstallSys.module
Log:
- Implemented code to install the final config file.
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Sat Jul 26 20:55:05 2008
@@ -34,8 +34,7 @@
TRY MKDIR ClsGlobal.sTargetMnt
END IF
- ' FrmInstallSys.tlCurrPkg.Text = "Mounting target partitions"
-
+
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
'/DISABLED FOR TESTING INSTALL ONLY
@@ -205,6 +204,7 @@
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()
@@ -302,7 +302,7 @@
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()
@@ -373,7 +373,7 @@
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
@@ -470,12 +470,9 @@
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
INC iPkgNum
- 'IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
+
sTlzPath = Trim(sLine)
- 'sTlzName = Trim(Right(sLine, Len(sLine) - RInStr(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
PRINT sTlzName & sTlzPath
sDump = ""
@@ -498,13 +495,73 @@
hproc.State = Process.Stopped
' INC iPkgNum
END IF
+ NEXT
- NEXT
-
+ ME.INSTALL_CONFIG_PACKAGES()
+END
+
+
+PUBLIC SUB INSTALL_CONFIG_PACKAGES()
+ DIM sList AS String[]
+ DIM sLinarr AS String[]
+ DIM sRawList AS String
+ DIM sPkg AS String
+ 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)
+ IF InStr(sRawList, "\n") THEN
+ PRINT "Multiple config files found ... starting at the top
of the list"
+
+ sList = Split(sRawList, "\n")
+ FOR i = 0 TO sList.count - 1
+ sCOnfLine = Trim(sList[i])
+ IF Left(sCOnfLine, Len("CONF")) = "CONF" THEN
+ sPkg = Right(sCOnfLine, Len(sCOnfLine) - InStr(sCOnfLine, "\'"))
+ 'PRINT sPkg
+ sLinarr = Split(sPkg, ":")
+ sPkgPath = sLinarr[0]
+
+ 'PRINT sPkgPath
+ ' now install the packages
+ INC iPkgNum
+ hproc = SHELL "install-pkg " & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sPkgPath & Space(1) & ClsGlobal.sTargetMnt & " || echo
\'FAILED\'" FOR READ
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT 2
+ UNTIL
+ hproc.State = Process.Stopped
+' INC iPkgNum
+ END IF
+ END IF
+ NEXT
+ ELSE ' only one line found
+ PRINT "Found a single CONF package... Installing it now"
+ sRawList = Trim(sRawList)
+ sLinarr = Split(sRawList, ":")
+ sPkgPath = Right(sLinarr[0], Len(sLinarr[0]) - InStr(sLinarr[0], "\'"))
+ ' now install the package
+ INC iPkgNum
+ hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT 2
+ UNTIL
+ hproc.State = Process.Stopped
+' INC iPkgNum
+ END IF
+ END IF
+
END
+
PUBLIC SUB Process_read()
|
|
From: <cod...@go...> - 2008-07-26 05:25:26
|
Author: M0E.lnx
Date: Fri Jul 25 22:24:35 2008
New Revision: 83
Modified:
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
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlPartSel.module
Log:
- Fixed progress bars for overall and current packages
- Fixed bug in mount point selection click
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FMain.class
+# /root/gui-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:250
+#: FMain.class:251
msgid "Process Overview"
msgstr ""
-#: FMain.class:273
+#: FMain.class:274
msgid "Next"
msgstr ""
-#: FMain.class:279
+#: FMain.class:280
msgid "Back"
msgstr ""
-#: FMain.class:285
+#: FMain.class:286
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/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 Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/MdlWinDrives.module
+# /root/gui-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 Fri Jul 25 22:24:35 2008
@@ -42,7 +42,7 @@
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
+ SHELL "mount " & ClsPartSel.sHome & Space(1) &
ClsGlobal.sTargetMnt &/ "home -t " & LCase(ClsPartSel.fhome)
WAIT 'mount the home partition if defined
END IF
IF ClsPartSel.sUsr THEN
@@ -91,6 +91,14 @@
DIM sWinMntPnt AS String
DIM sFstab AS String
+ ' make the changes show up on the steps now
+ WITH FMain
+ .tvPlan["Inst2"].Selected = TRUE
+ .tvPlan["Inst2"].Picture = MdlCore.sNowPic
+ .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ END WITH
+
+
FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"
sFstab = "# /etc/fstab: static file system information.\n" &
@@ -198,9 +206,9 @@
FrmInstallSys.tlCurrPkg.Text = "Vectorlinux is now
installing ... Please wait"
ME.PERFORM_FULL_INSTALL()
're-direct to packages for now
- FrmInstallSys.tlCurrPkg.Text = "Installing Additional
software... Please wait"
- ME.INSTALL_REQUIRED_PACKAGES()
- ME.INSTALL_PACKAGES()
+ 'FrmInstallSys.tlCurrPkg.Text = "Installing Additional
software... Please wait"
+ 'ME.INSTALL_REQUIRED_PACKAGES()
+ 'ME.INSTALL_PACKAGES()
END IF
END
@@ -256,8 +264,8 @@
.Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
END WITH
iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
- Message.Info("Total packages = " & iPkgCnt)
- RETURN
+ 'Message.Info("Total packages = " & iPkgCnt)
+ 'RETURN
' make sure the progress is revealed at the main window
WITH FMain
.tvPlan["Inst1"].Picture = MdlCore.sDonePic
@@ -298,6 +306,7 @@
sDump = ""
sErr = ""
MdlCore.LOCK_GUI()
+ 'inc iPkgNum
hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " |
tar -xp -C " & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
WAIT 2
@@ -329,7 +338,8 @@
FrmInstallSys.tlBanner.Text = "Finished intalling Bulks"
' now to the packages individually
-
+ FrmInstallSys.tlBanner.Text = "Installing additional software."
+ ME.INSTALL_PACKAGES
END
@@ -401,9 +411,7 @@
' install each package
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & "
) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
sTargetSize = Trim(CStr(sTargetSize))
-
-
-
+
sDump = ""
sErr = ""
hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
FOR READ
@@ -435,7 +443,9 @@
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
END
PUBLIC FUNCTION INSTALL_REQUIRED_PACKAGES() AS Integer
@@ -448,33 +458,47 @@
DIM sTlzName AS String
DIM sTlzDesc AS String
DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
-
+ DIM iTlzTotal AS Integer = 0
+ DIM iCurrTlz AS Integer '= 0
+ MdlCore.LOCK_GUI()
'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
+
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
+ INC iPkgNum
'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 = Trim(sLine)
+ 'sTlzName = Trim(Right(sLine, Len(sLine) - RInStr(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
PRINT sTlzName & sTlzPath
sDump = ""
sErr = ""
- FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName & " ..."
- FrmInstallSys.pbInstallProg.Value = 0.0
- hproc = SHELL "install-pkg " & sTlzName & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ FrmInstallSys.tlCurrPkg.Text = "Installing " &
File.Name(sTlzPath) & " ..."
+ 'FrmInstallSys.pbInstallProg.Value = 0.0
+
+ 'figure out the progress again
+ ' for this one we will need to count the
packages, and base our progress on the number of packages
+ ' installed vs the total number of packags
+ iCurrTlz = i
+ FrmInstallSys.pbInstallProg.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iTlzTotal, iCurrTlz)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ hproc = SHELL "install-pkg " & sTlzPath & 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
+' INC iPkgNum
END IF
+
NEXT
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Fri Jul 25 22:24:35 2008
@@ -96,6 +96,7 @@
FMain.tvPlan["Inst1"].Selected = TRUE
FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Inst2"].Picture = MdlCore.sToDopic
'Umount the volume first
@@ -172,7 +173,10 @@
RETURN 0
END IF
END IF
-
+ ' turn swap on if available
+ IF ClsPartSel.sSwap THEN
+ SHELL "swapon -a " WAIT
+ END IF
END
PUBLIC SUB process_read()
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Fri Jul 25 22:24:35 2008
@@ -127,8 +127,7 @@
.y = y
.Height = tl.Height
.Width = tl.Width
- .ReadOnly = TRUE
- .tag = Trim(sPartList[i])
+ .ReadOnly = TRUE
.Add("Not Used")
.Add("/")
.Add("/home")
@@ -160,16 +159,17 @@
.Add("Ext2")
.Add("Ext3")
.Add("JFS")
+ '.Add("swap")
IF
InStr(Trim(FrmSelISO.lstInstallableImg.Text), .Tag) THEN
.Enabled = FALSE
ELSE
.Enabled = TRUE
END IF
- FOR EACH cb IN oFsTypes
- IF cb.Tag = .Tag THEN
- cb.Enabled = FALSE
- END IF
- NEXT
+ ' FOR EACH cb IN oFsTypes
+ ' IF cb.Tag = .Tag THEN
+ ' cb.Enabled = FALSE
+ ' END IF
+ ' NEXT
END WITH
@@ -192,7 +192,9 @@
END IF
SHELL " probepart | grep -i \" *swap$\" | cut -f 1 -d \' \' |
grep -e /dev" TO sSwapList
+
sSwapList = Trim(sSwapList)
+ IF sSwapList <> "" THEN
'Message.Info(sSwapList)
IF InStr(sSwapList, gb.NewLine) THEN
'several swap partitions found
@@ -201,9 +203,14 @@
spart = Trim(sSwapList)
'SHELL "export " & sSwapList & "=$(df -h | grep -i swap) |
cut -f 2 -d \' \'" TO vSwapSize
SHELL " export sw=$(probepart | grep -i \" *swap$\") && echo
$sw | cut -f 4 -d \' \'" TO vSwapSize
-
- iswapsize = CInt(vSwapSize)
- iswapsize = Round(iswapsize / 1024 / 1024, -2)
+ Message(CStr(vSwapSize))
+ IF vSwapSize <> "" THEN
+ 'vSwapSize = Trim(CStr(vSwapSize))
+ Message.Info(vSwapSize)
+ iswapsize = CInt(vSwapSize)
+
+ iswapsize = Round(iswapsize / 1024 / 1024, -2)
+ END IF
'now create the swap label and combo box
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "swlabel"
WITH tl
@@ -236,7 +243,7 @@
'Message.Info("Swap total = " & iswapsize)
END IF
-
+END IF
FOR EACH cb IN MdlPartSel.oMountPoints
IF cb.width > iWidth THEN
iWidth = cb.Width
@@ -258,20 +265,12 @@
PUBLIC SUB MountPoints_CLick()
DIM sdropdwn AS ComboBox
- DIM sTag AS String = LAST.tag
- DIM sText AS String = Trim(LAST.text)
-
- 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"
- END IF
- STOP EVENT
- NEXT
+ 'DIM sTag AS String = LAST.tag
+ 'DIM sText AS String = Trim(LAST.text)
+
+
- ' set the variable to the global class
- SELECT CASE LCase(LAST.text)
+ SELECT CASE LAST.text
CASE "/"
ClsPartSel.sRoot = LCase(LAST.tag)
CASE "/home"
@@ -285,53 +284,130 @@
CASE "/var"
ClsPartSel.sVar = LCase(LAST.tag)
CASE "Swap"
-
- END SELECT
-
-
+ ClsPartSel.sSwap = LCase(LAST.tag)
+ 'Message("Swap Flag")
+ FOR EACH sdropdwn IN oFsTypes
+ IF sdropdwn.Tag = LAST.tag THEN
+ sdropdwn.Add("Swap")
+ sdropdwn.Text = "Swap"
+ sdropdwn.Enabled = FALSE
+ ELSE
+ sdropdwn.Enabled = TRUE
+ IF sdropdwn.Find("Swap") <> -1 THEN
+ sdropdwn.Remove(sdropdwn.Find("Swap"))
+ END IF
+ 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)
+
+ ' 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
+' 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)
@@ -363,7 +439,7 @@
NEXT
-
+ 'Message(LAST.tag)
END
PUBLIC SUB SET_SELECTED_PARTITION(SPartition AS String, sMountPoint AS String)
|
|
From: <cod...@go...> - 2008-07-26 02:11:58
|
Author: uelsk8s
Date: Fri Jul 25 19:11:26 2008
New Revision: 82
Modified:
branches/iVL/FMain.class
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlSetup.module
Log:
additions to install_required_packages and start of liloconf
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Fri Jul 25 19:11:26 2008
@@ -29,7 +29,8 @@
PUBLIC SUB Form_Open()
DIM iImg AS Image
ME.Maximized = TRUE
-MdlCore.LOCK_GUI()
+MdlCore.LOCK_GUI
+'MdlCore.LOCK_GUI()
ClsGlobal.sBackNav = NEW Object[]
ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
FrmSelISO.Reparent(ME.pnlWinHost)
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Jul 25 19:11:26 2008
@@ -199,6 +199,7 @@
ME.PERFORM_FULL_INSTALL()
're-direct to packages for now
FrmInstallSys.tlCurrPkg.Text = "Installing Additional
software... Please wait"
+ ME.INSTALL_REQUIRED_PACKAGES()
ME.INSTALL_PACKAGES()
END IF
@@ -273,8 +274,8 @@
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)
+ 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, ":")
@@ -449,9 +450,9 @@
DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT"))
-
- 'sFile = Split(sRawFile, "\n")
- sFile = SHELL "ls /mnt/cdrom/packages/required/*.t?z"
+ SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sRawFile
+ sFile = Split(sRawFile, "\n")
+ 'SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sFile
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
'IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
@@ -460,9 +461,12 @@
'sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove
the ./ from the location line
'END IF
' now install the package with the information we already have
+ PRINT sTlzName & sTlzPath
sDump = ""
sErr = ""
- hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
FOR READ
+ FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName & " ..."
+ FrmInstallSys.pbInstallProg.Value = 0.0
+ hproc = SHELL "install-pkg " & sTlzName & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Fri Jul 25 19:11:26 2008
@@ -45,11 +45,13 @@
IF ClsPartSel.sVar THEN
sList.Add(ClsPartSel.sVar & ";" & ClsPartSel.fVar)
END IF
-
+ FrmInstallSys.tlBanner.Text = "Formatting partitions"
' 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], ";"))
+ FrmInstallSys.tlBanner.Text = "Formatting " & sPart & " with " & sFormat
+ WAIT 1
iretval = MdlPartFrmt.FORMAT_PARTITION(sPart, sFormat) ' do the formatting
IF iretval <> 0 THEN
RETURN ' stop right there there's been an error.
@@ -140,14 +142,14 @@
PRINT "Formatting " & sAddr & " to " & sFS
hproc = SHELL sCommand & " || echo \'FAILED\'" WAIT 'for read
- WAIT
+ WAIT 2
IF hproc.State = Process.Running THEN
REPEAT
' FrmHostPrep.tlStatus.Text = "Formatting " & sAddr & " as "
& sFS
FrmInstallSys.tlCurrPkg.Text = " Formatting " & sAddr & "
as " & sFS
- WAIT
+ WAIT 1
UNTIL
hproc.State = Process.Stopped
sDump = Trim(sDump)
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Fri Jul 25 19:11:26 2008
@@ -177,6 +177,9 @@
SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT | grep ^\"PACKAGE NAME\"" TO sDump
sTotalList = sTotalList & gb.NewLine & Trim(sDump)
sDump = ""
+ SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sDump
+ sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+ sDump = ""
' split the array
sList = Split(sTotalList, "\n")
FOR i = 0 TO sList.Count - 1
|
|
From: <cod...@go...> - 2008-07-25 21:06:40
|
Author: M0E.lnx
Date: Fri Jul 25 14:05:23 2008
New Revision: 81
Modified:
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/FrmDiskPart.form
branches/iVL/MdlCore.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlSetup.module
Log:
More cosmetic fixes. Implemented the overall install progress meter.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/ClsGlobal.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/ClsPartSel.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/ClsWinDrives.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/FMain.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/FrmDiskPart.class
+# /root/iVL/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmDiskPart.class:100
+#: FrmDiskPart.class:102
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/FrmLicense.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/FrmPartScheme.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/FrmPartSel.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/FrmPkgSel.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/FrmSelISO.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/FrmSummary.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/FrmWinDrives.class
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/MdlCore.module
+# /root/iVL/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 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/MdlDiskPart.module
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/MdlObjSizer.module
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/MdlPartSel.module
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/MdlPkgSel.module
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/MdlSetup.module
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/MdlSummarize.module
+# /root/iVL/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 Fri Jul 25 14:05:23 2008
@@ -1,4 +1,4 @@
-# /root/new-install/MdlWinDrives.module
+# /root/iVL/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmDiskPart.form
==============================================================================
--- branches/iVL/FrmDiskPart.form (original)
+++ branches/iVL/FrmDiskPart.form Fri Jul 25 14:05:23 2008
@@ -3,11 +3,17 @@
{ Form Form
MoveScaled(0,0,84,55)
Text = ("")
+ Arrangement = Arrange.Vertical
{ tlBanner TextLabel
MoveScaled(1,2,81,9)
Text = ("Disk Partitioning:")
}
- { EmbGPARTED Embedder
- MoveScaled(1,13,82,39)
+ { VPanel1 VPanel
+ MoveScaled(1,12,74,48)
+ Expand = True
+ { EmbGPARTED Embedder
+ MoveScaled(6,7,76,32)
+ Expand = True
+ }
}
}
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Fri Jul 25 14:05:23 2008
@@ -45,6 +45,9 @@
FOR i = 0 TO sISOList.count - 1
sIso = Trim(sISOList[i])
SHELL "umount /mnt/loop" WAIT
+ IF Exist("/mnt/loop") = FALSE THEN
+ MKDIR "/mnt/loop"
+ END IF
SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/
sISO & Space(1) & "/mnt/loop" WAIT
IF Exist("/mnt/loop/veclinux/SETUP.CONF") =
TRUE THEN
IF FrmSelISO.lstInstallableImg.Find(sISO
& " on " & sDrive) = -1 THEN
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Jul 25 14:05:23 2008
@@ -18,6 +18,10 @@
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
+
+PRIVATE iPkgCnt AS Integer
+PRIVATE iPkgNum AS Integer = 0
+
PUBLIC FUNCTION MOUNT_DEFINED_PARTITIONS() AS Integer
@@ -30,7 +34,7 @@
TRY MKDIR ClsGlobal.sTargetMnt
END IF
- FrmInstallSys.tlCurrPkg.Text = "Mounting target partitions"
+ ' FrmInstallSys.tlCurrPkg.Text = "Mounting target partitions"
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
@@ -191,8 +195,10 @@
IF ClsPkgSel.bCustom = TRUE THEN
' perform custom install
ELSE
+ FrmInstallSys.tlCurrPkg.Text = "Vectorlinux is now
installing ... Please wait"
ME.PERFORM_FULL_INSTALL()
're-direct to packages for now
+ FrmInstallSys.tlCurrPkg.Text = "Installing Additional
software... Please wait"
ME.INSTALL_PACKAGES()
END IF
@@ -242,14 +248,25 @@
DIM sConfPath AS String
DIM sOptPkgPath AS String
DIM iVal AS Float
+
DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
WITH FrmInstallSys
.Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
END WITH
+ iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+ Message.Info("Total packages = " & iPkgCnt)
+ RETURN
+ ' make sure the progress is revealed at the main window
+ WITH FMain
+ .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ .tvPlan["Inst2"].Selected = TRUE
+ .tvPlan["Inst2"].Picture = MdlCore.sNowPic
+ END WITH
- MdlSetup.SHOW_PROGRESS_CONTROLS()
+ MdlSetup.SHOW_PROGRESS_CONTROLS()
+ FrmInstallSys.tlBanner.Text = "Vectorlinux is now being installed.
Please wait..."
ClsGlobal.sTargetMnt = "/mnt/target"
sFile = Split(File.Load(Temp$("SETUP.CONF")), "\n")
FOR i = 0 TO sFile.count - 1
@@ -287,8 +304,7 @@
REPEAT
WAIT 2
UPDATE_STEP_PROGRESS(sTargetSize, sPakSize)
-
-
+
UNTIL
hproc.State = Process.Stopped
@@ -298,9 +314,14 @@
"<b>ERROR</b>" & gb.NewLine &
sErr)
RETURN 1
- END IF
+ ELSE
+ FrmInstallSys.pbInstallProg.Value = 1
+
END IF
PRINT sPak & " is installed... "
+ INC iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ END IF
'PRINT "Needs to install " & sPak
END IF
NEXT
@@ -391,13 +412,28 @@
WAIT 1
UPDATE_STEP_PROGRESS(sTargetSize, iTlzSize)
' figure out the progress again
+
UNTIL
hproc.State = Process.Stopped
+ IF InStr(sDump, "FAILED") > 0 THEN
+ ERROR
+ RETURN 1
+ ELSE
+ IF FrmInstallSys.pbInstallProg.Value <> 1 THEN
+ FrmInstallSys.pbInstallProg.Value = 1
+ END IF
+ END IF
END IF
+ INC iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
END IF
NEXT
-
+ ' DONE INSTALLING SOFTWARE.
+ 'Message.Info("Installation complete. Ready for configuration"
+ FrmInstallSys.tlBanner.Text = "Installation phase complete.
Ready for configuration"
+ FrmInstallSys.pbInstallProg.Value = 1
+ MdlCore.unlock_gui()
END
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Fri Jul 25 14:05:23 2008
@@ -75,6 +75,7 @@
.tlCurrPkg2.Visible = TRUE
.FrmProg.Text = " Installing VectorLinux "
END WITH
+ frminstallsys.tlBanner.Text = "Vectorlinux is now installing ...
Please wait."
MdlCore.LOCK_GUI()
MdlInstallSys.MOUNT_DEFINED_PARTITIONS() ' let the game begin
@@ -89,6 +90,11 @@
DIM sCommand AS String
DIM sResult AS String
+ DIM iMinFrameH AS Integer
+
+ FMain.tvPlan["Inst1"].Selected = TRUE
+ FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+
'Umount the volume first
SHELL "mount | grep " & sAddr TO sResult
@@ -108,13 +114,37 @@
sCommand = "mkfs.xfs -f " & sAddr
CASE "jfs"
sCommand = "mkfs.jfs -q " & sAddr
+ CASE "swap"
+ sCommand = "mkswap " & sAddr
END SELECT
+
+ ' fix the form
+
+ iMinFrameH = FrmInstallSys.tlCurrPkg.Height +
FrmInstallSys.tlCurrPkg2.Height + frminstallsys.tlCurrStepLbl.Height +
FrmInstallSys.pbInstallProg2.Height +
FrmInstallSys.tlCurrStepLbl.Height + 36
+ WITH FrmInstallSys
+ .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
+
+
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
+
FrmInstallSys.tlCurrPkg.Text = " Formatting " & sAddr & "
as " & sFS
WAIT
@@ -132,6 +162,10 @@
RETURN 1
ELSE
'Message(" System is ready for VectorLinux")
+ ' ready to install packages
+ WITH FMain
+ .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ END WITH
RETURN 0
END IF
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Fri Jul 25 14:05:23 2008
@@ -61,7 +61,7 @@
.Height = 27
.x = x
.y = y
- .Width = MdlObjSizer.get_object_width(.text) * 2.5
+ .Width = MdlObjSizer.get_object_width(.text) * 2.2
END WITH
icol1 = x
icol2 = x + tl.Width + 4
@@ -71,7 +71,7 @@
.Height = 27
.x = icol2
.y = y
- .Width = MdlObjSizer.get_object_width(.text) * 2.5
+ .Width = MdlObjSizer.get_object_width(.text) * 2.2
END WITH
icol3 = tl.x + tl.Width + 4
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
@@ -80,7 +80,7 @@
.Height = 27
.x = icol3
.y = y
- .Width = MdlObjSizer.get_object_width(.text) * 2.5
+ .Width = MdlObjSizer.get_object_width(.text) * 2.2
END WITH
y = y + 20
@@ -136,6 +136,7 @@
.Add("/usr")
.Add("/var")
.Add("/tmp")
+ .Add("Swap")
IF InStr(FrmSelISO.lstInstallableImg.Text, .tag) THEN
.Enabled = FALSE
ELSE
@@ -159,7 +160,17 @@
.Add("Ext2")
.Add("Ext3")
.Add("JFS")
-
+ IF
InStr(Trim(FrmSelISO.lstInstallableImg.Text), .Tag) THEN
+ .Enabled = FALSE
+ ELSE
+ .Enabled = TRUE
+ END IF
+ FOR EACH cb IN oFsTypes
+ IF cb.Tag = .Tag THEN
+ cb.Enabled = FALSE
+ END IF
+ NEXT
+
END WITH
oFsTypes.Add(cb)
@@ -273,19 +284,30 @@
ClsPartSel.sTmp = LCase(LAST.tag)
CASE "/var"
ClsPartSel.sVar = LCase(LAST.tag)
+ CASE "Swap"
+
END SELECT
IF sText = "Not Used" THEN
FOR EACH sdropdwn IN oFsTypes
- IF sdropdwn.Tag = sTag THEN
- sdropdwn.Text = "Do not format"
+ 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
@@ -293,7 +315,7 @@
END IF
NEXT
END IF
- IF LAST.text <> "Not Used" THEN
+ IF LAST.text <> "Not Used" AND LAST.text <> "Swap" THEN
FOR EACH sdropdwn IN oFsTypes
IF sdropdwn.tag = LAST.tag THEN
sdropdwn.Text = "XFS"
@@ -302,8 +324,15 @@
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)
@@ -331,6 +360,7 @@
ClsPartSel.fUsr = LAST.text
END SELECT
END IF
+
NEXT
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Fri Jul 25 14:05:23 2008
@@ -145,6 +145,59 @@
END
+PUBLIC FUNCTION UPDATE_OVERALL_PROGRESS(iTotalPkgs AS Integer,
iCurrPkg AS Integer) AS Float
+
+ DIM fRet AS Float
+ fRet = iCurrPkg / iTotalPkgs
+ fRet = Round(fRet, -2)
+ RETURN fRet
+
+END
+
+
+
+PUBLIC FUNCTION CALCULATE_PACKAGE_COUNT(bCustom AS Boolean) AS Integer
+
+ DIM sDump AS String
+ DIM sTotalList AS String
+ DIM i AS Integer
+ DIM sList AS String[]
+ DIM iQTY AS Integer
+
+ ' let's get a package count
+ IF bCustom = FALSE THEN ' DOING A FULL INSTALL
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF
| grep ^BULK" TO sDump
+ sDump = Trim(sDump)
+ sTotalList = sTotalList & sDump
+ sTotalList = Trim(sTotalList)
+ sDump = ""
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF
| grep ^CONF" TO sDump
+ sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+ sDump = ""
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT | grep ^\"PACKAGE NAME\"" TO sDump
+ sTotalList = sTotalList & gb.NewLine & Trim(sDump)
+ sDump = ""
+ ' split the array
+ sList = Split(sTotalList, "\n")
+ FOR i = 0 TO sList.Count - 1
+ IF sList[i] = "" THEN
+ sList.Delete(i)
+ END IF
+ NEXT
+ iQTY = sList.Count
+
+ ELSE ' GOING FOR CUSTOM INSTALL
+
+ END IF
+
+
+ RETURN iQTY
+
+
+
+END
+
+
|
|
From: <cod...@go...> - 2008-07-25 18:29:56
|
Author: uelsk8s
Date: Fri Jul 25 11:29:21 2008
New Revision: 80
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:
added progressbar code to install packages sub
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /root/new-install/.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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsGlobal.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsPartSel.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsWinDrives.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmDiskPart.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmLicense.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartScheme.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartSel.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPkgSel.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSelISO.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSummary.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmWinDrives.class
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /root/new-install/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 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlObjSizer.module
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPkgSel.module
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSummarize.module
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlWinDrives.module
+# /root/new-install/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 Fri Jul 25 11:29:21 2008
@@ -193,7 +193,7 @@
ELSE
ME.PERFORM_FULL_INSTALL()
're-direct to packages for now
- 'ME.INSTALL_PACKAGES()
+ ME.INSTALL_PACKAGES()
END IF
END
@@ -287,7 +287,7 @@
REPEAT
WAIT 2
UPDATE_STEP_PROGRESS(sTargetSize, sPakSize)
- PRINT CStr(iCurrSize) & "/" &
CStr(iTotalSize) & " = " & iVal & "%"
+
UNTIL
@@ -341,7 +341,7 @@
IF iVal > FrmInstallSys.pbInstallProg.Value THEN
FrmInstallSys.pbInstallProg.Value = iVal
END IF
-
+ PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize + sPakSize) & " = " &
iVal & "%"
END
@@ -358,6 +358,7 @@
DIM sTlzDesc AS String
DIM iTlzSize AS Integer
DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
+ DIM sTargetSize AS Variant
sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT"))
@@ -369,11 +370,16 @@
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
iTlzSize = Trim(Right(sFile[i + 3], Len(sFile[i + 3]) -
InStr(sFile[i + 3], ":")))
- iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
- iTlzSize = Trim(iTlzSize)
+ 'iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
+ 'iTlzSize = Trim(iTlzSize)
+ FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName & " ..."
+ FrmInstallSys.pbInstallProg.Value = 0.0
PRINT " Install " & sTlzBasePath &/ sTlzPath &/ sTlzName
' install each package
+ SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & "
) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
+ sTargetSize = Trim(CStr(sTargetSize))
+
sDump = ""
@@ -382,7 +388,8 @@
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
- WAIT 2
+ WAIT 1
+ UPDATE_STEP_PROGRESS(sTargetSize, iTlzSize)
' figure out the progress again
UNTIL
hproc.State = Process.Stopped
|
|
From: <cod...@go...> - 2008-07-25 17:12:31
|
Author: M0...@gm...
Date: Fri Jul 25 10:11:40 2008
New Revision: 79
Modified:
branches/iVL/MdlInstallSys.module
Log:
Added size detection for packages
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Jul 25 10:11:40 2008
@@ -356,6 +356,7 @@
DIM sTlzPath AS String
DIM sTlzName AS String
DIM sTlzDesc AS String
+ DIM iTlzSize AS Integer
DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT"))
@@ -367,23 +368,25 @@
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
+ iTlzSize = Trim(Right(sFile[i + 3], Len(sFile[i + 3]) -
InStr(sFile[i + 3], ":")))
+ iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
+ iTlzSize = Trim(iTlzSize)
+
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
|
|
From: <cod...@go...> - 2008-07-25 17:05:29
|
Author: uelsk8s
Date: Fri Jul 25 10:04:42 2008
New Revision: 78
Modified:
branches/iVL/MdlInstallSys.module
Log:
moved progressbar update to own sub
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Jul 25 10:04:42 2008
@@ -243,11 +243,6 @@
DIM sOptPkgPath AS String
DIM iVal AS Float
DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
- DIM iProgress AS Float
- DIM iMBProgress AS Float
- DIM ipct AS Float
- DIM iMinpct AS Float = ".01"
- DIM iMaxpct AS Float = ".99"
WITH FrmInstallSys
.Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
@@ -291,29 +286,9 @@
IF hproc.State = Process.Running THEN
REPEAT
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))
- 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 & "%"
+ UPDATE_STEP_PROGRESS(sTargetSize, sPakSize)
PRINT CStr(iCurrSize) & "/" &
CStr(iTotalSize) & " = " & iVal & "%"
- IF iVal >
FrmInstallSys.pbInstallProg.Value THEN
- FrmInstallSys.pbInstallProg.Value = iVal
- END IF
+
UNTIL
hproc.State = Process.Stopped
@@ -337,7 +312,7 @@
END
-PUBLIC SUB UPDATE_STEP_PROGRESS(iCurrSize AS Float, iProjectedSize AS Float)
+PUBLIC SUB UPDATE_STEP_PROGRESS(sTargetSize AS Float, sPakSize AS Float)
DIM iMBProgress AS Float
DIM ipct AS Float
@@ -345,11 +320,27 @@
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
-
+ DIM iCurrSize AS Variant
+
+ SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) && echo
$gsize | cut -f3 -d \' \'" TO iCurrSize
+ iCurrSize = Trim(CStr(iCurrSize))
+ 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
+ IF iVal > FrmInstallSys.pbInstallProg.Value THEN
+ FrmInstallSys.pbInstallProg.Value = iVal
+ END IF
END
@@ -400,7 +391,46 @@
END
-
+PUBLIC FUNCTION INSTALL_REQUIRED_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")
+ sFile = SHELL "ls /mnt/cdrom/packages/required/*.t?z"
+ 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 SUB Process_read()
|
|
From: <cod...@go...> - 2008-07-23 22:03:14
|
Author: M0...@gm...
Date: Wed Jul 23 14:59:48 2008
New Revision: 69
Added:
branches/iVL/images/installer-steel.png (contents, props changed)
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/FMain.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/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/FrmPartScheme.form
branches/iVL/FrmPkgSel.class
branches/iVL/FrmPkgSel.form
branches/iVL/FrmSummary.class
branches/iVL/FrmSummary.form
branches/iVL/FrmWinDrives.form
branches/iVL/MdlInstallSys.module
branches/iVL/images/installer.png
Log:
Attempt to install bulks... not coming up so easily.Need to figure out
a way to parse the full command to the linux shell. FIXME. Trying out
new graphic for installer logo. Small cosmetic fixes
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsPartSel.class
+# /home/moises/area-51/projects/installer/ClsPartSel.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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /home/moises/area-51/projects/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:244
+#: FMain.class:245
msgid "Process Overview"
msgstr ""
-#: FMain.class:258
+#: FMain.class:259
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:269
+#: FMain.class:270
msgid "Next"
msgstr ""
-#: FMain.class:275
+#: FMain.class:276
msgid "Back"
msgstr ""
-#: FMain.class:281
+#: FMain.class:282
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPkgSel.class
+# /home/moises/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPkgSel.class:98
+#: FrmPkgSel.class:99
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:104
+#: FrmPkgSel.class:105
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:109
+#: FrmPkgSel.class:110
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSummary.class
+# /home/moises/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSummary.class:80
+#: FrmSummary.class:87
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlWinDrives.module
+# /home/moises/area-51/projects/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 Wed Jul 23 14:59:48 2008
@@ -102,7 +102,8 @@
.tvPlan.Move(4, 24, .Frame1.Width - 8, .Frame1.Height - 28) ' THIS
WILL LEAVE 16PIX ON TOP AND BOTTOM AND 2 ON LEFT AND RIGHT
'.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
- .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 3.5)))
+ '.pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 3.5)))
+ .pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.Top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlBanner.Height + (.btback.Height * 3.5)))
.btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
Modified: branches/iVL/FrmHostPrep.class
==============================================================================
--- branches/iVL/FrmHostPrep.class (original)
+++ branches/iVL/FrmHostPrep.class Wed Jul 23 14:59:48 2008
@@ -20,14 +20,20 @@
PUBLIC SUB Form_Open()
FMain.FrmCurr = ME
-FMain.tvPlan["Prep3"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
FMain.tvPlan["Inst0"].picture = MdlCore.sNowPic
FMain.tvPlan["Inst0"].Selected = TRUE
' may need to move this code to another event. The FormOpen event
only happens once.
- ME.PREPARE_ALL_PARTITIONS()
+ 'ME.PREPARE_ALL_PARTITIONS()
+ WAIT
+ FrmInstallSys.Reparent(ME.Parent)
+ ME.Hide
+ FrmInstallSys.Show
+' ME.Hide
+
END
Modified: branches/iVL/FrmHostPrep.form
==============================================================================
--- branches/iVL/FrmHostPrep.form (original)
+++ branches/iVL/FrmHostPrep.form Wed Jul 23 14:59:48 2008
@@ -4,7 +4,7 @@
MoveScaled(0,0,73,48)
Text = ("")
{ tlbanner TextLabel
- MoveScaled(1,3,59,3.375)
+ MoveScaled(1,1,59,3.375)
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 Wed Jul 23 14:59:48 2008
@@ -30,18 +30,21 @@
' 2: Write /etc/fstab
' 3: Install packages
- sRes = MdlInstallSys.MOUNT_DEFINED_PARTITIONS()
- IF sRes AND sRes <> 0 THEN
- RETURN ' exit... there was an error mounting
- END IF
+ ' 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
- RETURN
+ Message("Error writing fstab")
+ RETURN
END IF
sRes = 0
sRes = MdlInstallSys.INSTALL_BULK_PACKAGES()
IF sRes AND sRes <> 0 THEN
+ Message("Error installing bulk packages")
RETURN
END IF
sRes = 0
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Wed Jul 23 14:59:48 2008
@@ -4,7 +4,7 @@
MoveScaled(0,0,78,51)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(6,1,63,3)
+ MoveScaled(1,1,63,3)
Text = ("Vectorlinux is currently being installed to your
system... Please wait")
}
{ FrmProg Frame
Modified: branches/iVL/FrmPartScheme.form
==============================================================================
--- branches/iVL/FrmPartScheme.form (original)
+++ branches/iVL/FrmPartScheme.form Wed Jul 23 14:59:48 2008
@@ -4,19 +4,19 @@
MoveScaled(0,0,81,50)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(1,2,51,4)
+ MoveScaled(1,1,51,4)
Text = ("Select your disk partition option")
}
{ rbUseExisting RadioButton
- MoveScaled(2,7,32,3.3333)
+ MoveScaled(1,6,32,3.25)
Text = ("Use existing disk partitions")
}
{ rbEditPartitions RadioButton
- MoveScaled(2,12,62,3.3333)
+ MoveScaled(1,10,62,3.25)
Text = ("Modify my disk partitions to make room for new installation")
}
{ tlChoiceExp TextLabel
- MoveScaled(1,20,76,23)
+ MoveScaled(1,16,76,23)
Text = ("TextLabel1")
}
}
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Wed Jul 23 14:59:48 2008
@@ -34,7 +34,8 @@
PUBLIC SUB Form_Resize()
WITH ME
- .tlBanner.Width = .ClientWidth - 8
+ '.tlBanner.Width = .ClientWidth - 8
+ .tlBanner.Move(4, 4, .ClientWidth - 8, 27)
.rbFull.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8,
MdlObjSizer.get_object_width(.rbfull.text) + 36)
.rbCustom.Move(.tlBanner.Left, .rbFull.top + .rbFull.Height + 4,
MdlObjSizer.get_object_width(.rbcustom.text) + 36)
.tlActionDesc.Width = .tlBanner.Width - 4
Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form (original)
+++ branches/iVL/FrmPkgSel.form Wed Jul 23 14:59:48 2008
@@ -4,23 +4,23 @@
MoveScaled(0,0,64,64)
Text = ("")
{ tlBanner TextLabel
- MoveScaled(1,2,55,5)
+ MoveScaled(1,1,55,5)
Text = ("TextLabel1")
Alignment = Align.Normal
}
{ rbFull RadioButton
- MoveScaled(1,8,40,3)
+ MoveScaled(1,7,40,3.375)
Text = ("Full Install")
}
{ rbCustom RadioButton
- MoveScaled(1,11,55,3)
+ MoveScaled(1,12,55,3.375)
Text = ("Custom Install")
}
{ tlActionDesc TextLabel
- MoveScaled(1,15,63,6)
+ MoveScaled(1,17,63,6)
Text = ("")
}
{ scrlInstallOpts ScrollView
- MoveScaled(1,22,52,28)
+ MoveScaled(1,24,52,28)
}
}
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Wed Jul 23 14:59:48 2008
@@ -31,17 +31,25 @@
FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
FMain.tvPlan["Inst0"].Picture = MdlCore.sNowPic
FMain.btback.Enabled = TRUE
-FMain.btback.ForeColor = Color.Black
+' FMain.btback.ForeColor = Color.Black
END
PUBLIC SUB Form_Resize()
WITH ME
- .tlBanner.Width = .ClientWidth - 4
- .scrSumm.Move(.tlBanner.left, .tlBanner.top + .tlBanner.Height +
4, .tlBanner.Width - 32, .ClientHeight - .tlBanner.Height * 2)
- .tlSummary.Move(4, 4)
+ .tlBanner.Move(4, 4, .ClientWidth - 8)
+ '.scrSumm.Move(4, .tlBanner.top + (.tlBanner.Height +
8), .tlBanner.Width - (.tlBanner.Width / 2), .ClientH
- .tlBanner.Height * 1.5)
+ '.tlBanner.Width = .ClientWidth - 8
+ '.scrSumm.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height +
8, .tlBanner.Width - 300, .ClientHeight - .tlBanner.Height * 1.5)
+ .scrSumm.Move(.tlBanner.left, .tlBanner.top + .tlBanner.Height +
4, .tlBanner.Width - 4, .ClientHeight - .tlBanner.Height * 2)
+ '.scrSumm.Move(4, .tlBanner.top + .tlBanner.Height + 4)
+ '.scrSumm.Resize(.ClientWidth - 16, .tlBanner.top
+ .tlBanner.Height + 4)
+ .tlSummary.Move(2, 4)
'.tlSummary.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height
+ 4, .tlBanner.Width, .ClientH - 16)
+
+
+
END WITH
Modified: branches/iVL/FrmSummary.form
==============================================================================
--- branches/iVL/FrmSummary.form (original)
+++ branches/iVL/FrmSummary.form Wed Jul 23 14:59:48 2008
@@ -3,17 +3,16 @@
{ Form Form
MoveScaled(0,0,64,64)
Text = ("")
- Arrangement = Arrange.Vertical
{ tlBanner TextLabel
MoveScaled(1,1,27,10)
Text = ("TextLabel1")
- Alignment = Align.Left
+ Alignment = Align.TopLeft
}
{ scrSumm ScrollView
- MoveScaled(1,12,61,43)
- Arrangement = Arrange.Vertical
+ MoveScaled(0,12,61,43)
{ tlSummary TextLabel
- MoveScaled(1,2,55,85)
+ MoveScaled(2,1,55,85)
+ Expand = True
Text = ("TextLabel1")
}
}
Modified: branches/iVL/FrmWinDrives.form
==============================================================================
--- branches/iVL/FrmWinDrives.form (original)
+++ branches/iVL/FrmWinDrives.form Wed Jul 23 14:59:48 2008
@@ -8,7 +8,7 @@
Expand = True
}
{ tlBanner TextLabel
- MoveScaled(1,2,65,5)
+ MoveScaled(1,1,65,5)
Text = ("Select the windows partitions you would like to mount
during boot")
}
}
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Wed Jul 23 14:59:48 2008
@@ -15,12 +15,17 @@
' 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 FUNCTION MOUNT_DEFINED_PARTITIONS() AS Integer
+ PRIVATE hproc AS Process
+ PRIVATE sDump AS String
+ PRIVATE sErr AS String
+
+PUBLIC FUNCTION MOUNT_DEFINED_PARTITIONS() AS Integer
-
+
' this is where we need to set the mount target
- ClsGlobal.sTargetMnt = "/mnt/target"
+ 'ClsGlobal.sTargetMnt = "/mnt/target"
+ ClsGlobal.sTargetMnt = "/home/moises/mnt/target" ' just for testing now.
IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
END IF
@@ -29,12 +34,13 @@
SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
- 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
+ '/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
- 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
@@ -59,7 +65,7 @@
'WRITE THE NEW FSTAB NOW, RIGHT BEFORE INSTALLING PACKAGES.
- 'ME.WRITE_NEW_FSTAB() ' do this from the install form
+ ME.WRITE_NEW_FSTAB() ' do this from the install form
@@ -160,12 +166,25 @@
sFstab = sFstab & gb.NewLine &
ClsPartSel.sSwap & Space(5) & "none" & Space(5) & "swap" & Space(5)
& "sw" & Space(5) & "0" & Space(5) & "0"
END IF
+
+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 = "/home/moises/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
TRY File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "fstab", SConv(sFstab))
CATCH
- RETURN 1
+ PRINT ERROR
+ '.RETURN 1
END
@@ -192,15 +211,117 @@
END
PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
+ DIM i AS Integer
+ 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)
+
+ '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
+ ' ' '
+END
+
+
+
+PUBLIC FUNCTION INSTALL_PACKAGES() AS Integer
END
-PUBLIC FUNCTION INSTALL_PACKAGES() AS Integer
+PUBLIC FUNCTION INSTALL_TO_HOST(sCmnd AS String) AS Integer
+
+ hproc = SHELL sCmnd FOR READ
+
+
+END
+
+PUBLIC SUB Process_read()
+ DIM sLine AS String
+ READ #LAST, sLine, -256
+ sDump = sDump & gb.NewLine & sLine
+ PRINT sLine
END
+PUBLIC SUB process_error(msg AS String)
+ sErr = sErr & gb.NewLine & sErr
+ PRINT MSG
+END
\ No newline at end of file
Added: branches/iVL/images/installer-steel.png
==============================================================================
Binary file. No diff available.
Modified: branches/iVL/images/installer.png
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-07-23 02:24:47
|
Author: M0...@gm...
Date: Tue Jul 22 19:23:28 2008
New Revision: 68
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/FMain.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/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/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmPkgsel2.class
branches/iVL/FrmPkgsel2.form
branches/iVL/FrmSelISO.class
branches/iVL/FrmSummary.class
branches/iVL/MdlSummarize.module
Log:
Small cosmetic changes. Fixed problem with hidden navigation buttons
and touched up reverse navigation
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Jul 22 19:23:28 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 Tue Jul 22 19:23:28 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/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Jul 22 19:23:28 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.
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:238
+#: FMain.class:244
msgid "Process Overview"
msgstr ""
-#: FMain.class:252
+#: FMain.class:258
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:263
+#: FMain.class:269
msgid "Next"
msgstr ""
-#: FMain.class:269
+#: FMain.class:275
msgid "Back"
msgstr ""
-#: FMain.class:275
+#: FMain.class:281
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Jul 22 19:23:28 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 Tue Jul 22 19:23:28 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 Tue Jul 22 19:23:28 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.
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPkgSel.class:96
+#: FrmPkgSel.class:98
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:102
+#: FrmPkgSel.class:104
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:107
+#: FrmPkgSel.class:109
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Jul 22 19:23:28 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.
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSelISO.class:224
+#: FrmSelISO.class:228
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:230
+#: FrmSelISO.class:234
msgid "Select which distribution to install from the list below"
msgstr ""
-#: FrmSelISO.class:235
+#: FrmSelISO.class:239
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:240
+#: FrmSelISO.class:244
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Tue Jul 22 19:23:28 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.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSummary.class:73
+#: FrmSummary.class:80
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Jul 22 19:23:28 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 Tue Jul 22 19:23:28 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 Tue Jul 22 19:23:28 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/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Tue Jul 22 19:23:28 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 Tue Jul 22 19:23:28 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 Tue Jul 22 19:23:28 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 Tue Jul 22 19:23:28 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 Tue Jul 22 19:23:28 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/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Jul 22 19:23:28 2008
@@ -44,12 +44,16 @@
FrmSelISO.Show
MdlCore.PREPARE_INSTALL_LAYOUT
+
WITH ME
.btback.Enabled = FALSE
.btback.ForeColor = Color.Gray
.Frame1.BackColor = Color.Transparent
.tvPlan.BackColor = Color.transparent
.btQuit.Text = "Exit Installation"
+ .tvPlan["Prep0"].Selected = TRUE
+ .tvPlan["Prep0"].Picture = MdlCore.sNowPic
+
END WITH
'ME.TreeView1.BackColor = Color.Transparent
ME.AUTOSIZE_LEFT_PANE
@@ -98,7 +102,7 @@
.tvPlan.Move(4, 24, .Frame1.Width - 8, .Frame1.Height - 28) ' THIS
WILL LEAVE 16PIX ON TOP AND BOTTOM AND 2 ON LEFT AND RIGHT
'.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
- .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 2)))
+ .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 3.5)))
.btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
@@ -192,8 +196,10 @@
'IF ClsGlobal.sBackNav.Find(FrmCurr) = -1 THEN
' ClsGlobal.sBackNav.Add(FrmCurr)
'END IF
+ IF FrmCurr.Name <> "FrmDiskPart" THEN
IF ClsGlobal.sBackNav.Find(frmNext) = -1 THEN
ClsGlobal.sBackNav.Add(frmNext)
+ END IF
END IF
frmNext.Show
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Tue Jul 22 19:23:28 2008
@@ -75,7 +75,7 @@
PUBLIC SUB Form_Hide()
-
+FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Tue Jul 22 19:23:28 2008
@@ -63,13 +63,13 @@
ClsPartSel.bDoWin = FALSE
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
-
+ FMain.tvPlan["Prep1"].Selected = TRUE
+ FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic
END
PUBLIC SUB Form_Hide()
-
-
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
END
PUBLIC FUNCTION ANALYZE_PARTITION_SETUP() AS Integer
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Tue Jul 22 19:23:28 2008
@@ -65,8 +65,10 @@
PUBLIC SUB Form_Hide()
+ IF ClsPkgSel.bCustom = FALSE THEN
-
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
+ END IF
END
PUBLIC SUB Form_Show()
Modified: branches/iVL/FrmPkgsel2.class
==============================================================================
--- branches/iVL/FrmPkgsel2.class (original)
+++ branches/iVL/FrmPkgsel2.class Tue Jul 22 19:23:28 2008
@@ -26,6 +26,8 @@
END WITH
FMain.FrmCurr = ME
FMain.btback.Enabled = TRUE
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Prep2"].Selected = TRUE
FMain.btback.ForeColor = Color.Black
MdlPkgSel.LIST_PACKAGE_SELECTION()
END
@@ -57,5 +59,11 @@
PUBLIC SUB scrPkgs_MouseDown()
+
+END
+
+PUBLIC SUB Form_Hide()
+
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
END
Modified: branches/iVL/FrmPkgsel2.form
==============================================================================
--- branches/iVL/FrmPkgsel2.form (original)
+++ branches/iVL/FrmPkgsel2.form Tue Jul 22 19:23:28 2008
@@ -8,7 +8,7 @@
Text = ("TextLabel1")
}
{ scrPkgs ScrollView
- MoveScaled(0,8,50,22)
+ MoveScaled(1,8,50,22)
Expand = True
}
}
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Tue Jul 22 19:23:28 2008
@@ -54,6 +54,8 @@
FMain.sNextKey = "Prep0"
FMain.FrmCurr = ME
FMain.frmNext = FrmPartScheme
+' FMain.tvPlan["Prep0"].Selected = TRUE
+ ' FMain.tvPlan["Prep0"].Picture = MdlCore.sNowPic
IF ClsGlobal.sBackNav.Find(ME) = -1 THEN
ClsGlobal.sBackNav.Add(ME)
END IF
@@ -193,6 +195,8 @@
PUBLIC SUB Form_Hide()
FMain.frmLast = ME
+ FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
+
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Tue Jul 22 19:23:28 2008
@@ -50,5 +50,12 @@
PUBLIC SUB Form_Show()
Form_Open()
+
+
+END
+
+PUBLIC SUB Form_Hide()
+
+ FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
END
Modified: branches/iVL/MdlSummarize.module
==============================================================================
--- branches/iVL/MdlSummarize.module (original)
+++ branches/iVL/MdlSummarize.module Tue Jul 22 19:23:28 2008
@@ -86,7 +86,7 @@
sLine = ClsWinDrives.sWinDrives[i]
spart = Trim(Left(sLine, InStr(sLine, "|") - 1))
sMntPnt = Right(sLine, Len(sLine) - InStr(sLine, "|"))
- sRet = sRet & gb.NewLine & spart & " will be mounted to " & sMntPnt
+ sRet = sRet & "<br>" & spart & " will be mounted to " & sMntPnt
'Message.Info(sLine)
NEXT
sRet = Trim(sRet)
|
|
From: <cod...@go...> - 2008-07-22 22:00:43
|
Author: M0...@gm...
Date: Tue Jul 22 14:59:22 2008
New Revision: 67
Added:
branches/iVL/FrmHostPrep.class
branches/iVL/FrmHostPrep.form
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartFrmt.module
Modified:
branches/iVL/.lang/FMain.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/ClsGlobal.class
branches/iVL/ClsPartSel.class
branches/iVL/FMain.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmPkgsel2.class
branches/iVL/FrmSelISO.class
branches/iVL/FrmSummary.class
branches/iVL/FrmWinDrives.class
branches/iVL/MdlCore.module
branches/iVL/MdlDiskPart.module
branches/iVL/MdlPkgSel.module
branches/iVL/MdlSetup.module
Log:
- Fixed frame and button positions on FMAIN
- Added function to format and mount selected partitions (needs
testing... unable to test here)
- Added function to save /etc/fstab to the target.
- Designed installation window and began functions to install bulks and packages
- Enabled reverse navigation. The algorithm still needs work.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Jul 22 14:59:22 2008
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:209
+#: FMain.class:238
msgid "Process Overview"
msgstr ""
-#: FMain.class:223
+#: FMain.class:252
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:234
+#: FMain.class:263
msgid "Next"
msgstr ""
-#: FMain.class:240
+#: FMain.class:269
msgid "Back"
msgstr ""
-#: FMain.class:246
+#: FMain.class:275
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Jul 22 14:59:22 2008
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartScheme.class:97
+#: FrmPartScheme.class:105
msgid "Select your disk partition option"
msgstr ""
-#: FrmPartScheme.class:102
+#: FrmPartScheme.class:110
msgid "Use existing disk partitions"
msgstr ""
-#: FrmPartScheme.class:107
+#: FrmPartScheme.class:115
msgid "Modify my disk partitions to make room for new installation"
msgstr ""
-#: FrmPartScheme.class:112
+#: FrmPartScheme.class:120
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Tue Jul 22 14:59:22 2008
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:143
+#: FrmPartSel.class:151
msgid "Define where the operating system will be
installed\n<br>\nLinux is a modular operating system. This means that
it has the ability to keep system and user data separately.<br> A
recommended setup would included a / (root), a /home, and a swap
partitions.\n<br>\nPlease select which partitions you would like to use
for your install"
msgstr ""
-#: FrmPartSel.class:152
+#: FrmPartSel.class:160
msgid "Check this box if you have a Windows installation on your
system or any other windows partition (FAT, FAT32, NTFS) that you want
auto-mounted as soon as your computer starts"
msgstr ""
-#: FrmPartSel.class:153
+#: FrmPartSel.class:161
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr ""
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Tue Jul 22 14:59:22 2008
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPkgSel.class:88
+#: FrmPkgSel.class:96
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:94
+#: FrmPkgSel.class:102
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:99
+#: FrmPkgSel.class:107
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Jul 22 14:59:22 2008
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSelISO.class:215
+#: FrmSelISO.class:224
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:221
+#: FrmSelISO.class:230
msgid "Select which distribution to install from the list below"
msgstr ""
-#: FrmSelISO.class:226
+#: FrmSelISO.class:235
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:231
+#: FrmSelISO.class:240
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Tue Jul 22 14:59:22 2008
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSummary.class:65
+#: FrmSummary.class:73
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Jul 22 14:59:22 2008
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmWinDrives.class:66
+#: FrmWinDrives.class:68
msgid "Select the windows partitions you would like to mount during boot"
msgstr ""
Modified: branches/iVL/ClsGlobal.class
==============================================================================
--- branches/iVL/ClsGlobal.class (original)
+++ branches/iVL/ClsGlobal.class Tue Jul 22 14:59:22 2008
@@ -40,3 +40,5 @@
STATIC PUBLIC sDocDir AS String
STATIC PUBLIC sSetupConfPath AS String
STATIC PUBLIC sReadMePath AS String
+
+STATIC PUBLIC sBackNav AS Object[]
Modified: branches/iVL/ClsPartSel.class
==============================================================================
--- branches/iVL/ClsPartSel.class (original)
+++ branches/iVL/ClsPartSel.class Tue Jul 22 14:59:22 2008
@@ -33,3 +33,5 @@
STATIC PUBLIC sSwap AS String
STATIC PUBLIC bDoWin AS Boolean
+
+STATIC PUBLIC sPartitionArray AS String[]
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Jul 22 14:59:22 2008
@@ -28,6 +28,8 @@
PUBLIC SUB Form_Open()
DIM iImg AS Image
+
+ClsGlobal.sBackNav = NEW Object[]
ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
FrmSelISO.Reparent(ME.pnlWinHost)
FrmSelISO.Width = pnlWinHost.Width
@@ -90,9 +92,12 @@
WITH ME
.tlBanner.width = ME.width
- .Frame1.Move(4, .PictureBox1.top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth * 1.60, .ClientHeight - tlBanner.Height -
(.btback.Height * 1.5))
+ .Frame1.Move(4, .PictureBox1.Top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth * 1.5, .ClientHeight - .PictureBox1.Height * 1.5)
+ '.Frame1.Move(4, .PictureBox1.top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth * 1.60, .ClientHeight - tlBanner.Height -
(.btback.Height * 2))
'.Frame1.Resize(MdlCore.iLeftWidth * 1.60, .ClientHeight -
tlBanner.Height - (.btback.Height * 1.5))
- .tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
+ .tvPlan.Move(4, 24, .Frame1.Width - 8, .Frame1.Height - 28) ' THIS
WILL LEAVE 16PIX ON TOP AND BOTTOM AND 2 ON LEFT AND RIGHT
+ '.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
+
.pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 2)))
.btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
@@ -173,6 +178,10 @@
CASE "FrmWinDrives"
'Move on to selecting packages
frmNext = FrmPkgSel
+ CASE "FrmSummary"
+ frmNext = FrmHostPrep ' prepare host
+
+
END SELECT
@@ -180,7 +189,27 @@
frmNext.Reparent(ME.pnlWinHost)
FrmCurr.Hide
frmLast = FrmCurr
+ 'IF ClsGlobal.sBackNav.Find(FrmCurr) = -1 THEN
+ ' ClsGlobal.sBackNav.Add(FrmCurr)
+ 'END IF
+ IF ClsGlobal.sBackNav.Find(frmNext) = -1 THEN
+ ClsGlobal.sBackNav.Add(frmNext)
+ END IF
frmNext.Show
-
+
+
+END
+
+PUBLIC SUB btback_Click()
+
+ DIM iKey AS Integer
+ DIM frm AS Form
+ iKey = ClsGlobal.sBackNav.Find(FrmCurr)
+ IF iKey <> -1 THEN
+ frm = ClsGlobal.sBackNav[iKey - 1]
+ FrmCurr.Hide
+ frm.Show
+ END IF
+
END
Added: branches/iVL/FrmHostPrep.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmHostPrep.class Tue Jul 22 14:59:22 2008
@@ -0,0 +1,101 @@
+' 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()
+
+FMain.FrmCurr = ME
+FMain.tvPlan["Prep3"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst0"].picture = MdlCore.sNowPic
+FMain.tvPlan["Inst0"].Selected = TRUE
+
+
+
+ ' may need to move this code to another event. The FormOpen event
only happens once.
+ ME.PREPARE_ALL_PARTITIONS()
+
+END
+
+
+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
+ RETURN
+ ELSE
+ 'move on to installing.. first, make fstab
+ END IF
+
+END
+
+
+
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .tlbanner.Move(4, 8, .ClientWidth - 8)
+ .frmStatus.Move(.tlbanner.Left, .tlbanner.Height *
1.5, .tlbanner.Width, .tlbanner.Height * 6)
+ .tlStatus.move(4, 24, .frmStatus.Width - 8, .frmStatus.Height - 36)
+
+ END WITH
+
+END
+
+PUBLIC SUB Form_Show()
+
+ Form_Open()
+
+
+END
Added: branches/iVL/FrmHostPrep.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmHostPrep.form Tue Jul 22 14:59:22 2008
@@ -0,0 +1,18 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,73,48)
+ Text = ("")
+ { tlbanner TextLabel
+ MoveScaled(1,3,59,3.375)
+ Text = ("Vectorlinux is preparing your system for installation.
Please wait.")
+ }
+ { frmStatus Frame
+ MoveScaled(1,10,71,20)
+ Text = ("Current Status")
+ { tlStatus TextLabel
+ MoveScaled(1,3,67,12)
+ Text = ("TextLabel1")
+ }
+ }
+}
Added: branches/iVL/FrmInstallSys.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSys.class Tue Jul 22 14:59:22 2008
@@ -0,0 +1,74 @@
+' 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()
+ 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
+
+ 'initiate install procedure
+ ' 1: MOUNT PARTITIONS
+ ' 2: Write /etc/fstab
+ ' 3: Install packages
+
+ 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
+ RETURN
+ END IF
+ sRes = 0
+ sRes = MdlInstallSys.INSTALL_BULK_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.
+
+
+
+
+END
+
+PUBLIC SUB Form_Show()
+
+ Form_Open()
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .tlBanner.Move(4, 16, .ClientWidth - 16)
+ .FrmProg.Move(.tlBanner.Left, .tlBanner.Height * 2, .ClientWidth - 8)
+ .tlCurrPkg.Move(4, 4, .FrmProg.Width - 8)
+ .pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.Height *
3, .tlCurrPkg.Width, 24)
+ END WITH
+END
Added: branches/iVL/FrmInstallSys.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmInstallSys.form Tue Jul 22 14:59:22 2008
@@ -0,0 +1,21 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,78,51)
+ Text = ("")
+ { tlBanner TextLabel
+ MoveScaled(6,1,63,3)
+ Text = ("Vectorlinux is currently being installed to your
system... Please wait")
+ }
+ { FrmProg Frame
+ MoveScaled(1,10,76,19)
+ Text = ("")
+ { tlCurrPkg TextLabel
+ MoveScaled(1,1,45,3.375)
+ Text = ("TextLabel1")
+ }
+ { pbInstallProg ProgressBar
+ MoveScaled(1,7,25,3)
+ }
+ }
+}
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Tue Jul 22 14:59:22 2008
@@ -36,6 +36,8 @@
FMain.tvPlan["Prep1"].Selected = TRUE
FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic
FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
+FMain.btback.Enabled = TRUE
+FMain.btback.ForeColor = Color.Black
'FMain.frmNext = FrmPartSel
WITH ME
.rbEditPartitions.Width =
MdlObjSizer.get_object_width(.rbEditPartitions.Text) + 24
@@ -74,5 +76,11 @@
PUBLIC SUB Form_Hide()
+
+END
+
+PUBLIC SUB Form_Show()
+
+ Form_Open()
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Tue Jul 22 14:59:22 2008
@@ -61,6 +61,8 @@
MdlPartSel.DISPLAY_PARTITION_OPTIONS
ME.cbDoWin.Value = FALSE
ClsPartSel.bDoWin = FALSE
+ FMain.btback.Enabled = TRUE
+FMain.btback.ForeColor = Color.Black
END
@@ -123,3 +125,9 @@
END
+
+PUBLIC SUB Form_Show()
+
+ Form_Open
+
+END
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Tue Jul 22 14:59:22 2008
@@ -26,6 +26,8 @@
FMain.tvPlan["Prep2"].Selected = TRUE
FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic
FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
+ FMain.btback.Enabled = TRUE
+FMain.btback.ForeColor = Color.Black
END
@@ -64,5 +66,11 @@
PUBLIC SUB Form_Hide()
+
+END
+
+PUBLIC SUB Form_Show()
+
+ Form_Open()
END
Modified: branches/iVL/FrmPkgsel2.class
==============================================================================
--- branches/iVL/FrmPkgsel2.class (original)
+++ branches/iVL/FrmPkgsel2.class Tue Jul 22 14:59:22 2008
@@ -25,6 +25,8 @@
END WITH
FMain.FrmCurr = ME
+ FMain.btback.Enabled = TRUE
+FMain.btback.ForeColor = Color.Black
MdlPkgSel.LIST_PACKAGE_SELECTION()
END
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Tue Jul 22 14:59:22 2008
@@ -54,6 +54,9 @@
FMain.sNextKey = "Prep0"
FMain.FrmCurr = ME
FMain.frmNext = FrmPartScheme
+ IF ClsGlobal.sBackNav.Find(ME) = -1 THEN
+ ClsGlobal.sBackNav.Add(ME)
+ END IF
' shape the main form according to the findings
'warn the user if no installable media was found
@@ -191,5 +194,11 @@
FMain.frmLast = ME
+
+END
+
+PUBLIC SUB Form_Show()
+
+ Form_Open()
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Tue Jul 22 14:59:22 2008
@@ -30,6 +30,8 @@
FMain.tvPlan["Inst0"].Selected = TRUE
FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
FMain.tvPlan["Inst0"].Picture = MdlCore.sNowPic
+ FMain.btback.Enabled = TRUE
+FMain.btback.ForeColor = Color.Black
END
@@ -42,5 +44,11 @@
'.tlSummary.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height
+ 4, .tlBanner.Width, .ClientH - 16)
END WITH
+
+END
+
+PUBLIC SUB Form_Show()
+
+ Form_Open()
END
Modified: branches/iVL/FrmWinDrives.class
==============================================================================
--- branches/iVL/FrmWinDrives.class (original)
+++ branches/iVL/FrmWinDrives.class Tue Jul 22 14:59:22 2008
@@ -22,6 +22,8 @@
MdlWinDrives.LIST_WIN_PARTITIONS
'ME.Resize(ME.Parent.Width - 12, ME.Parent.Height - 12)
FMain.FrmCurr = ME
+ FMain.btback.Enabled = TRUE
+FMain.btback.ForeColor = Color.Black
END
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Tue Jul 22 14:59:22 2008
@@ -471,7 +471,8 @@
'.Add("Prep3", "Desktop Selection", sToDopic, "Prep")
.Add("Inst", "Installation", sCatPic)
.Add("Inst0", "Installation Summary", sToDopic, "Inst")
- .Add("Inst1", "Install Operating System", sToDopic, "Inst")
+ .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("Conf1", "System Administrator", sToDopic, "Conf")
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Tue Jul 22 14:59:22 2008
@@ -33,7 +33,7 @@
END IF
FrmDiskPart.tlBanner.Text = "<h3>Loading gparted .... Please wait</h3>"
- SHELL "/usr/bin/gparted"
+ SHELL "/usr/sbin/gparted"
WAIT 3
sTitle = "GParted"
Added: branches/iVL/MdlInstallSys.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlInstallSys.module Tue Jul 22 14:59:22 2008
@@ -0,0 +1,206 @@
+' 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/>.
+
+PUBLIC FUNCTION MOUNT_DEFINED_PARTITIONS() AS Integer
+
+
+
+ ' this is where we need to set the mount target
+ ClsGlobal.sTargetMnt = "/mnt/target"
+ IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
+ TRY MKDIR ClsGlobal.sTargetMnt
+ END IF
+
+ FrmInstallSys.tlCurrPkg.Text = "Mounting target partitions"
+
+ SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
+
+ 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
+
+ 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
+ END IF
+ IF ClsPartSel.sOpt THEN
+ SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "opt" WAIT
+ SHELL "mount " & ClsPartSel.sOpt & Space(1) &
ClsGlobal.sTargetMnt &/ "opt -t " & ClsPartSel.fOpt WAIT 'mount the opt partitiong
+ END IF
+ IF ClsPartSel.sVar THEN
+ SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var" WAIT
+ SHELL "mount " & ClsPartSel.sVar & Space(1) &
ClsGlobal.sTargetMnt &/ "var -t " & ClsPartSel.fVar WAIT
+ END IF
+ IF ClsPartSel.sTmp THEN
+ SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
+ SHELL "mount " & ClsPartSel.sTmp & Space(1) &
ClsGlobal.sTargetMnt &/ "tmp -t " & ClsPartSel.fTmp WAIT
+ END IF
+
+ ' see if there is a swap partition and use it
+ IF ClsPartSel.sSwap THEN
+ SHELL "swapon -a " WAIT
+ END IF
+
+ 'WRITE THE NEW FSTAB NOW, RIGHT BEFORE INSTALLING PACKAGES.
+
+ 'ME.WRITE_NEW_FSTAB() ' do this from the install form
+
+
+
+
+END
+
+
+
+PUBLIC FUNCTION WRITE_NEW_FSTAB() AS Integer
+
+ DIM sEntry AS String
+ DIM sPartition AS String
+ DIM sMountPoint AS String
+ DIM sMntOpts AS String
+ DIM i AS Integer
+ DIM sWinPart AS String
+ DIM sWinMntPnt AS String
+ DIM sFstab AS String
+
+ FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"
+
+ sFstab = "# /etc/fstab: static file system information.\n" &
+ "#\n" &
+"#The following is an example.Please see fstab(5) for further
details.\n" &
+"#Please refer to mount(1) for a complete description OF mount
options.\n" &
+"#\n" &
+"#Format:\n" &
+"# < file system > < mount point > < type > < options > < dump > <
pass >\n" &
+"#\n" &
+"#dump(8)uses the < dump > field to determine which file systems need
\n" &
+"# to be dumped.fsck(8)uses the < pass > column TO determine which
file \n" &
+"#systems need TO be checked - - the root file system should have a 1
in \n" &
+"#this field, other file systems a 2, AND any file systems that should
\n" &
+"#not be checked(such AS MS - initrd / mnt OR NFS file systems)a
0.\n\n\n" &
+"#The Linux partitions\n"
+
+sFstab = sFstab & gb.NewLine &
+ClsPartSel.sRoot & " / " & LCase(ClsPartSel.fRoot) & " " &
ME.fS_oPTIONS(LCase(ClsPartSel.fRoot)) & " 0 1" & gb.NewLine
+IF ClsPartSel.sHome THEN
+ sFstab = sFstab & gb.NewLine & ClsPartSel.sHome & " /home " &
LCase(ClsPartSel.fhome) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fhome))
& " 0 2"
+END IF
+IF ClsPartSel.sUsr THEN
+ sFstab = sFstab & gb.NewLine & ClsPartSel.sUsr & " /usr " &
LCase(ClsPartSel.fUsr) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fUsr))
& " 0 2 "
+END IF
+IF ClsPartSel.sOpt THEN
+ sFstab = sFstab & gb.NewLine & ClsPartSel.sopt & " /opt " &
LCase(ClsPartSel.fOpt) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fOpt))
& " 0 2 "
+END IF
+IF ClsPartSel.sVar THEN
+ sFstab = sFstab & gb.NewLine & ClsPartSel.sVar & " /var " &
LCase(ClsPartSel.fVar) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fVar))
& " 0 2 "
+END IF
+IF ClsPartSel.sTmp THEN
+ sFstab = sFstab & gb.NewLine & ClsPartSel.sTmp & " /tmp " &
LCase(ClsPartSel.fTmp) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fTmp))
& " 0 2 "
+END IF
+
+sFstab = sFstab & "\n\n" &
+"# Shared Windows/Linux partition" &
+"#/dev/hda1 /mnt/dos msdos umask=0 0 0 \n" &
+"#/dev/hda1 /mnt/win vfat
fmask=111,dmask=0,quiet,shortname=mixed,user 0 0 \n" &
+"#/dev/hda1 /mnt/win ntfs umask=0 0 0\n"
+ IF ClsWinDrives.sWinDrives THEN
+ FOR i = 0 TO ClsWinDrives.sWinDrives.Count - 1
+ sWinPart = Trim(Left(ClsWinDrives.sWinDrives[i],
InStr(ClsWinDrives.sWinDrives[i], "|") - 1))
+ sWinMntPnt = Trim(Right(ClsWinDrives.sWinDrives[i],
Len(ClsWinDrives.sWinDrives[i]) - InStr(ClsWinDrives.sWinDrives[i], "|")))
+ 'Message("Mount " & sWinPart & " to " & sWinMntPnt)
+ ' if this is right... then add it to the file
+ NEXT
+ END IF
+
+sFstab = sFstab & "\n\n" &
+"# Floppy disks \n" &
+"# The 'noauto' option indicates that the file system should not be
mounted \n" &
+"# with 'mount -a' 'user' indicates that normal users are allowed to
mount \n" &
+"# the file system. \n" &
+"/dev/fd0 /mnt/floppy auto defaults,noauto,user 0 0 \n" &
+"#/dev/fd1 /mnt/floppy auto defaults,noauto,user 0 0 \n\n" &
+"# If you have a ls-120 floppy drive, it could be on /dev/hda b c d
etc.\n" &
+"#/dev/hdd /mnt/ls120 auto defaults,noauto,user 0 0 \n\n" &
+"# CDROM, CDWRITER, DVD \n" &
+"/dev/cdrom /media/cdrom iso9660 defaults,noauto,ro,user 0 0 \n" &
+"#/dev/cdwriter /media/cdwriter iso9660 defaults,noauto,rw,user 0 0
\n" &
+"#/dev/dvd /media/dvd auto defaults,noauto,ro,user 0 0\n\n" &
+"# NFS file systems:\n" &
+"#linux01.gwdg.de:/suse/6.3/i386.de /mnt/nfs nfs defaults 0 0\n\n" &
+"# proc file system:\n" &
+"proc /proc proc defaults 0 0\n\n" &
+"# Unix98 devpts filesystem: \n" &
+"none /dev/pts devpts gid=5,mode=666 0 0\n\n" &
+"# Shared memory filesystem: \n" &
+"tmpfs /dev/shm tmpfs defaults 0 0 \n\n" &
+"# Basic USB filesystem\n" &
+"sysfs /sys sysfs defaults 0 0\n" &
+"usbfs /proc/bus/usb usbfs rw,devmode=0666 0 0\n\n" &
+"# example of a VFAT USB pendrive\n" &
+"#/dev/sda1 /mnt/pendrive vfat
fmask=111,dmask=0,noauto,user,quiet,shortname=mixed 0 0\n\n" &
+"# Swap partitions\n" &
+"# The 'sw' option means auto activating with 'swapon -a'.\n"
+IF ClsPartSel.sSwap THEN
+ sFstab = sFstab & gb.NewLine &
+ ClsPartSel.sSwap & Space(5) & "none" & Space(5) & "swap" & Space(5)
& "sw" & Space(5) & "0" & Space(5) & "0"
+END IF
+' Wheewww!... that's the whole fstab there... Please fix the win partitions
+
+ ' now save the file to /etc/fstab
+ TRY File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "fstab", SConv(sFstab))
+ CATCH
+ RETURN 1
+
+
+END
+PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String
+
+ DIM sMntOpts AS String
+
+ SELECT CASE LCase(sType)
+ CASE "reiserfs"
+ sMntOpts = "noatime"
+ CASE "vfat"
+ sMntOpts = "fmask=111,dmask=0,gid=users,shortname=mixed,quiet,user"
+ CASE "ntfs"
+ sMntOpts = "umask=0,gid=users,user"
+ CASE "ext2", "ext3"
+ sMntOpts = "defaults"
+ CASE ELSE
+ sMntOpts = "defaults"
+ END SELECT
+
+ RETURN sMntOpts
+
+
+END
+
+PUBLIC FUNCTION INSTALL_BULK_PACKAGES() AS Integer
+
+
+
+END
+
+PUBLIC FUNCTION INSTALL_PACKAGES() AS Integer
+
+
+
+END
+
+
Added: branches/iVL/MdlPartFrmt.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlPartFrmt.module Tue Jul 22 14:59:22 2008
@@ -0,0 +1,76 @@
+' 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 hproc AS Process
+ PRIVATE sDump AS String
+ PRIVATE sErr AS String
+PUBLIC FUNCTION FORMAT_PARTITION(sAddr AS String, sFS AS String) AS
Integer ' will return 1 for trouble, 0 for clear
+
+ DIM sCommand AS String
+
+
+ 'Umount the volume first
+ SHELL "umount " & sAddr WAIT
+ SELECT CASE LCase(sFS)
+ CASE "ext2"
+ sCommand = "mke2fs -q " & sAddr
+ CASE "ext3"
+ sCommand = "mke2fs -q -j " & saddr
+ CASE "reiserfs"
+ sCommand = "mkreiserfs --format 3.6 -ff " & sAddr
+ CASE "xfs"
+ sCommand = "mkfs.xfs -f " & sAddr
+ END SELECT
+
+ hproc = SHELL sCommand & " | echo \'FAILED\'" FOR READ
+ WAIT
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ FrmHostPrep.tlStatus.Text = "Formatting " & sAddr & " as " & sFS
+
+ WAIT
+ UNTIL
+ hproc.State = Process.Stopped
+ sDump = Trim(sDump)
+ sErr = Trim(sErr)
+ IF InStr(sDump, "FAILED") > 0 AND sErr <> "" THEN
+ '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
+ 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
+
+
+END
+
+PUBLIC SUB Process_error(errormsg AS String)
+ sErr = sErr & gb.NewLine & sErr
+
+END
+
Modified: branches/iVL/MdlPkgSel.module
==============================================================================
--- branches/iVL/MdlPkgSel.module (original)
+++ branches/iVL/MdlPkgSel.module Tue Jul 22 14:59:22 2008
@@ -177,12 +177,10 @@
ClsPkgSel.arrPkgs.Add(cb.Tag)
END IF
NEXT
-
-
-
-
-
-
+
END
+
+
+
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Tue Jul 22 14:59:22 2008
@@ -133,173 +133,7 @@
END
-PUBLIC SUB MOUNT_DEFINED_PARTITIONS()
-
-
- ' this is where we need to set the mount target
- ClsGlobal.sTargetMnt = "/mnt/target"
- IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
- TRY MKDIR ClsGlobal.sTargetMnt
- END IF
-
- SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
-
- 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
-
- 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
- END IF
- IF ClsPartSel.sOpt THEN
- SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "opt" WAIT
- SHELL "mount " & ClsPartSel.sOpt & Space(1) &
ClsGlobal.sTargetMnt &/ "opt -t " & ClsPartSel.fOpt WAIT 'mount the opt partitiong
- END IF
- IF ClsPartSel.sVar THEN
- SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var" WAIT
- SHELL "mount " & ClsPartSel.sVar & Space(1) &
ClsGlobal.sTargetMnt &/ "var -t " & ClsPartSel.fVar WAIT
- END IF
- IF ClsPartSel.sTmp THEN
- SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
- SHELL "mount " & ClsPartSel.sTmp & Space(1) &
ClsGlobal.sTargetMnt &/ "tmp -t " & ClsPartSel.fTmp WAIT
- END IF
-
- ' see if there is a swap partition and use it
- IF ClsPartSel.sSwap THEN
- SHELL "swapon -a " WAIT
- END IF
-
- 'WRITE THE NEW FSTAB NOW, RIGHT BEFORE INSTALLING PACKAGES.
-
- ME.WRITE_NEW_FSTAB()
-
-
-
-END
-
-
-
-PUBLIC FUNCTION WRITE_NEW_FSTAB()
-
- DIM sEntry AS String
- DIM sPartition AS String
- DIM sMountPoint AS String
- DIM sMntOpts AS String
- DIM i AS Integer
- DIM sWinPart AS String
- DIM sWinMntPnt AS String
- DIM sFstab AS String
-
- sFstab = "# /etc/fstab: static file system information.\n" &
- "#\n" &
-"#The following is an example.Please see fstab(5) for further
details.\n" &
-"#Please refer to mount(1) for a complete description OF mount
options.\n" &
-"#\n" &
-"#Format:\n" &
-"# < file system > < mount point > < type > < options > < dump > <
pass >\n" &
-"#\n" &
-"#dump(8)uses the < dump > field to determine which file systems need
\n" &
-"# to be dumped.fsck(8)uses the < pass > column TO determine which
file \n" &
-"#systems need TO be checked - - the root file system should have a 1
in \n" &
-"#this field, other file systems a 2, AND any file systems that should
\n" &
-"#not be checked(such AS MS - initrd / mnt OR NFS file systems)a
0.\n\n\n" &
-"#The Linux partitions\n"
-
-sFstab = sFstab & gb.NewLine &
-ClsPartSel.sRoot & " / " & LCase(ClsPartSel.fRoot) & " " &
ME.fS_oPTIONS(LCase(ClsPartSel.fRoot)) & " 0 1" & gb.NewLine
-IF ClsPartSel.sHome THEN
- sFstab = sFstab & gb.NewLine & ClsPartSel.sHome & " /home " &
LCase(ClsPartSel.fhome) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fhome))
& " 0 2"
-END IF
-IF ClsPartSel.sUsr THEN
- sFstab = sFstab & gb.NewLine & ClsPartSel.sUsr & " /usr " &
LCase(ClsPartSel.fUsr) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fUsr))
& " 0 2 "
-END IF
-IF ClsPartSel.sOpt THEN
- sFstab = sFstab & gb.NewLine & ClsPartSel.sopt & " /opt " &
LCase(ClsPartSel.fOpt) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fOpt))
& " 0 2 "
-END IF
-IF ClsPartSel.sVar THEN
- sFstab = sFstab & gb.NewLine & ClsPartSel.sVar & " /var " &
LCase(ClsPartSel.fVar) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fVar))
& " 0 2 "
-END IF
-IF ClsPartSel.sTmp THEN
- sFstab = sFstab & gb.NewLine & ClsPartSel.sTmp & " /tmp " &
LCase(ClsPartSel.fTmp) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fTmp))
& " 0 2 "
-END IF
-
-sFstab = sFstab & "\n\n" &
-"# Shared Windows/Linux partition" &
-"#/dev/hda1 /mnt/dos msdos umask=0 0 0 \n" &
-"#/dev/hda1 /mnt/win vfat
fmask=111,dmask=0,quiet,shortname=mixed,user 0 0 \n" &
-"#/dev/hda1 /mnt/win ntfs umask=0 0 0\n"
- IF ClsWinDrives.sWinDrives THEN
- FOR i = 0 TO ClsWinDrives.sWinDrives.Count - 1
- sWinPart = Trim(Left(ClsWinDrives.sWinDrives[i],
InStr(ClsWinDrives.sWinDrives[i], "|") - 1))
- sWinMntPnt = Trim(Right(ClsWinDrives.sWinDrives[i],
Len(ClsWinDrives.sWinDrives[i]) - InStr(ClsWinDrives.sWinDrives[i], "|")))
- Message("Mount " & sWinPart & " to " & sWinMntPnt)
- ' if this is right... then add it to the file
- NEXT
- END IF
-
-sFstab = sFstab & "\n\n" &
-"# Floppy disks \n" &
-"# The 'noauto' option indicates that the file system should not be
mounted \n" &
-"# with 'mount -a' 'user' indicates that normal users are allowed to
mount \n" &
-"# the file system. \n" &
-"/dev/fd0 /mnt/floppy auto defaults,noauto,user 0 0 \n" &
-"#/dev/fd1 /mnt/floppy auto defaults,noauto,user 0 0 \n\n" &
-"# If you have a ls-120 floppy drive, it could be on /dev/hda b c d
etc.\n" &
-"#/dev/hdd /mnt/ls120 auto defaults,noauto,user 0 0 \n\n" &
-"# CDROM, CDWRITER, DVD \n" &
-"/dev/cdrom /media/cdrom iso9660 defaults,noauto,ro,user 0 0 \n" &
-"#/dev/cdwriter /media/cdwriter iso9660 defaults,noauto,rw,user 0 0
\n" &
-"#/dev/dvd /media/dvd auto defaults,noauto,ro,user 0 0\n\n" &
-"# NFS file systems:\n" &
-"#linux01.gwdg.de:/suse/6.3/i386.de /mnt/nfs nfs defaults 0 0\n\n" &
-"# proc file system:\n" &
-"proc /proc proc defaults 0 0\n\n" &
-"# Unix98 devpts filesystem: \n" &
-"none /dev/pts devpts gid=5,mode=666 0 0\n\n" &
-"# Shared memory filesystem: \n" &
-"tmpfs /dev/shm tmpfs defaults 0 0 \n\n" &
-"# Basic USB filesystem\n" &
-"sysfs /sys sysfs defaults 0 0\n" &
-"usbfs /proc/bus/usb usbfs rw,devmode=0666 0 0\n\n" &
-"# example of a VFAT USB pendrive\n" &
-"#/dev/sda1 /mnt/pendrive vfat
fmask=111,dmask=0,noauto,user,quiet,shortname=mixed 0 0\n\n" &
-"# Swap partitions\n" &
-"# The 'sw' option means auto activating with 'swapon -a'.\n"
-IF ClsPartSel.sSwap THEN
- sFstab = sFstab & gb.NewLine &
- ClsPartSel.sSwap & Space(5) & "none" & Space(5) & "swap" & Space(5)
& "sw" & Space(5) & "0" & Space(5) & "0"
-END IF
-' Wheewww!... that's the whole fstab there... Please fix the win partitions
-
-
-
-
-END
-PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String
-
- DIM sMntOpts AS String
-
- SELECT CASE LCase(sType)
- CASE "reiserfs"
- sMntOpts = "noatime"
- CASE "vfat"
- sMntOpts = "fmask=111,dmask=0,gid=users,shortname=mixed,quiet,user"
- CASE "ntfs"
- sMntOpts = "umask=0,gid=users,user"
- CASE "ext2", "ext3"
- sMntOpts = "defaults"
- CASE ELSE
- sMntOpts = "defaults"
- END SELECT
-
- RETURN sMntOpts
-
-
-END
|
|
From: <cod...@go...> - 2008-07-21 21:58:12
|
Author: M0...@gm...
Date: Mon Jul 21 14:56:10 2008
New Revision: 66
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/FMain.class
branches/iVL/FMain.form
branches/iVL/FrmPkgSel.class
branches/iVL/FrmPkgSel.form
branches/iVL/FrmSelISO.class
branches/iVL/FrmSummary.class
branches/iVL/FrmSummary.form
branches/iVL/MdlCore.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlPkgSel.module
branches/iVL/MdlSetup.module
branches/iVL/MdlSummarize.module
branches/iVL/MdlWinDrives.module
branches/iVL/images/installer.png
branches/iVL/installer.gambas
Log:
+ R65
- Finished with install summary. Ready to begin installing packages... Finally
- Implemented installer logo on top (image may need to change, but the
code can stay the same)
- Fixed problem on ISO detection. In some cases, ISO's would not get listed.
This was due to a problem in the linux partition detection algorithm.
- Added function to read and set the selected partition types for linux partitions
- Fixed problem where MdlCore was listing an extra instance of one of
the combobox
items as residing in an empty cdrom volume.
- Added win partition listing to the install summary.
- Removed lag from the Fmain Start event. Now the form is fully
displayed, and a status label
states that the system is looking for installable media.
- Added better ISO recognition. It will now only list ISO images that
contain a SETUP.CONF.
This will hide any other ISO (Non-vector) WARNING: LIVE ISO'S ARE NOT
DETECTED. THIS IS DONE
INTENTIONALLY.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /home/moises/area-51/projects/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:197
+#: FMain.class:209
msgid "Process Overview"
msgstr ""
-#: FMain.class:210
+#: FMain.class:223
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:220
+#: FMain.class:234
msgid "Next"
msgstr ""
-#: FMain.class:226
+#: FMain.class:240
msgid "Back"
msgstr ""
-#: FMain.class:232
+#: FMain.class:246
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSummary.class
+# /home/moises/area-51/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSummary.class:55
+#: FrmSummary.class:65
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/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 Mon Jul 21 14:56:10 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlWinDrives.module
+# /home/moises/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Jul 21 14:56:10 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.27
+Version=0.0.28
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Jul 21 14:56:10 2008
@@ -27,10 +27,18 @@
END
PUBLIC SUB Form_Open()
+DIM iImg AS Image
ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
FrmSelISO.Reparent(ME.pnlWinHost)
FrmSelISO.Width = pnlWinHost.Width
FrmSelISO.Height = pnlWinHost.Height
+iImg = Image.Load("images/installer.png").Stretch(600, 80)
+'iImg.Resize(600, 80)
+PictureBox1.Resize(iImg.Width, iImg.Height)
+PictureBox1.Picture = iImg.Picture
+
+PictureBox1.Stretch = TRUE
+
FrmSelISO.Show
MdlCore.PREPARE_INSTALL_LAYOUT
@@ -82,15 +90,17 @@
WITH ME
.tlBanner.width = ME.width
- .Frame1.Resize(MdlCore.iLeftWidth * 1.60, .ClientHeight -
tlBanner.Height - (.btback.Height * 1.5))
+ .Frame1.Move(4, .PictureBox1.top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth * 1.60, .ClientHeight - tlBanner.Height -
(.btback.Height * 1.5))
+ '.Frame1.Resize(MdlCore.iLeftWidth * 1.60, .ClientHeight -
tlBanner.Height - (.btback.Height * 1.5))
.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
- .pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlbanner.height + (.btback.height * 2)))
+ .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 2)))
.btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
- '.btback.Move(.pnlWinHost.Left, .pnlWinHost.Top
+ .pnlWinHost.Height - (.btback.Height),
MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
' we want that one right in the middle
.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)
END WITH
END
@@ -130,6 +140,8 @@
Message.Error("You must select a \"/\" partition. This is the
target where the system will install to")
STOP EVENT
ELSE
+ ' set the partition types
+ MdlPartSel.SET_LINUX_PARTITION_TYPES()
IF ClsPartSel.bDoWin = TRUE THEN
frmNext = FrmWinDrives
ELSE
@@ -149,8 +161,7 @@
MdlPkgSel.GET_USER_BULK_SELECTION()
frmNext = FrmPkgsel2
ELSE
- ' now we are ready to summarize
- Message("Going for a simple install")
+ ' Going for simple install. Now we are ready to summarize
MdlSummarize.SUMMARIZE_INSTALL
frmNext = FrmSummary
END IF
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Mon Jul 21 14:56:10 2008
@@ -13,28 +13,34 @@
}
{ tlBanner TextLabel
MoveScaled(0,0,26,7)
+ Visible = False
Font = Font["+6"]
Background = Color.SelectedBackground
Foreground = Color.SelectedForeground
Text = ("VectorLinux Install")
Alignment = Align.Center
+ Transparent = True
}
{ pnlWinHost VBox
MoveScaled(28,9,66,56)
}
{ btnext Button
- MoveScaled(49,67,8,3.1111)
+ MoveScaled(49,67,8,3.1)
Text = ("Next")
Picture = Picture["icon:/16/right"]
}
{ btback Button
- MoveScaled(28,67,8,3.1111)
+ MoveScaled(28,67,8,3.1)
Text = ("Back")
Picture = Picture["icon:/16/left"]
}
{ btQuit Button
- MoveScaled(38,67,11,3.1111)
+ MoveScaled(38,67,11,3.1)
Text = ("Exit")
Picture = Picture["icon:/16/cancel"]
+ }
+ { PictureBox1 PictureBox
+ MoveScaled(36,1,54,8)
+ Stretch = True
}
}
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Mon Jul 21 14:56:10 2008
@@ -36,7 +36,7 @@
.rbFull.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8,
MdlObjSizer.get_object_width(.rbfull.text) + 36)
.rbCustom.Move(.tlBanner.Left, .rbFull.top + .rbFull.Height + 4,
MdlObjSizer.get_object_width(.rbcustom.text) + 36)
.tlActionDesc.Width = .tlBanner.Width - 4
- .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top
+ .tlActionDesc.Height + 8, .tlActionDesc.Width - 12, .ClientHeight -
(.tlActionDesc.top + (.tlActionDesc.height * 2)))
+ .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top
+ .tlActionDesc.Height + 8, .tlActionDesc.Width - 12, .ClientHeight -
(.tlActionDesc.top + (.tlActionDesc.height * 2.75)))
END WITH
Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form (original)
+++ branches/iVL/FrmPkgSel.form Mon Jul 21 14:56:10 2008
@@ -17,10 +17,10 @@
Text = ("Custom Install")
}
{ tlActionDesc TextLabel
- MoveScaled(1,15,63,7)
+ MoveScaled(1,15,63,6)
Text = ("")
}
{ scrlInstallOpts ScrollView
- MoveScaled(1,24,52,28)
+ MoveScaled(1,22,52,28)
}
}
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Mon Jul 21 14:56:10 2008
@@ -58,16 +58,16 @@
' shape the main form according to the findings
'warn the user if no installable media was found
- IF FrmSelISO.lstInstallableImg.Count = 0 THEN
- FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
- FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any
installable media on your system. Please insert your VectorLinux " &
- "installation CD and click \'" & FrmSelISO.btResCan.Text & "\' to
try again"
- FMain.btnext.Enabled = FALSE
- FMain.btnext.ForeColor = Color.Gray
- ELSE
- FMain.btnext.Enabled = TRUE
- FMain.btnext.ForeColor = Color.Black
- END IF
+ ' ' IF FrmSelISO.lstInstallableImg.Count = 0 THEN
+ ' ' FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
+ ' ' FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any
installable media on your system. Please insert your VectorLinux " &
+ ' ' "installation CD and click \'" & FrmSelISO.btResCan.Text & "\'
to try again"
+ ' ' FMain.btnext.Enabled = FALSE
+ ' ' FMain.btnext.ForeColor = Color.Gray
+ ' ' ELSE
+ ' ' FMain.btnext.Enabled = TRUE
+ ' ' FMain.btnext.ForeColor = Color.Black
+ ' ' END IF
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Mon Jul 21 14:56:10 2008
@@ -25,6 +25,11 @@
.tlBanner.Adjust
.tlSummary.Adjust
END WITH
+
+ FMain.FrmCurr = ME
+ FMain.tvPlan["Inst0"].Selected = TRUE
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Inst0"].Picture = MdlCore.sNowPic
END
@@ -32,7 +37,10 @@
WITH ME
.tlBanner.Width = .ClientWidth - 4
- .tlSummary.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height +
4, .tlBanner.Width, .ClientH - 16)
+ .scrSumm.Move(.tlBanner.left, .tlBanner.top + .tlBanner.Height +
4, .tlBanner.Width - 32, .ClientHeight - .tlBanner.Height * 2)
+ .tlSummary.Move(4, 4)
+ '.tlSummary.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height
+ 4, .tlBanner.Width, .ClientH - 16)
+
END WITH
END
Modified: branches/iVL/FrmSummary.form
==============================================================================
--- branches/iVL/FrmSummary.form (original)
+++ branches/iVL/FrmSummary.form Mon Jul 21 14:56:10 2008
@@ -3,13 +3,18 @@
{ Form Form
MoveScaled(0,0,64,64)
Text = ("")
+ Arrangement = Arrange.Vertical
{ tlBanner TextLabel
MoveScaled(1,1,27,10)
Text = ("TextLabel1")
Alignment = Align.Left
}
- { tlSummary TextLabel
- MoveScaled(1,13,61,49)
- Text = ("TextLabel1")
+ { scrSumm ScrollView
+ MoveScaled(1,12,61,43)
+ Arrangement = Arrange.Vertical
+ { tlSummary TextLabel
+ MoveScaled(1,2,55,85)
+ Text = ("TextLabel1")
+ }
}
}
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Mon Jul 21 14:56:10 2008
@@ -46,11 +46,14 @@
sIso = Trim(sISOList[i])
SHELL "umount /mnt/loop" WAIT
SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/
sISO & Space(1) & "/mnt/loop" WAIT
- File.Save(Temp(siso), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
- SHELL "umount /mnt/loop" WAIT
- IF FrmSelISO.lstInstallableImg.Find(sISO & "
on " & sDrive) = -1 THEN
+ IF Exist("/mnt/loop/veclinux/SETUP.CONF") =
TRUE THEN
+ IF FrmSelISO.lstInstallableImg.Find(sISO
& " on " & sDrive) = -1 THEN
+ File.Save(Temp(siso), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
FrmSelISO.lstInstallableImg.Add(sISO & " on "
& sDrive)
END IF
+ END IF
+ SHELL "umount /mnt/loop" WAIT
+
NEXT
SHELL "umount " & ClsGlobal.sSourceMnt WAIT
@@ -90,9 +93,10 @@
DIM sPartition AS String
'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \'
\'" TO sResults
- SHELL " /sbin/probepart | grep -e \" *Linux$\" | cut -f 1 -d \' \' |
grep -e \" /dev\"" TO sResults
+ SHELL "/sbin/probepart | grep -e \" Linux$\" | cut -f 1 -d \' \' |
grep /dev" TO sResults
+
sResults = Trim(sResults)
- 'Message.Info(sResults)
+ 'Message.Info(sResults)
IF InStr(sResults, gb.NewLine) THEN
sPartList = Split(sResults, gb.NewLine)
FOR i = 0 TO sPartList.count - 1
@@ -120,7 +124,6 @@
DIM sDump AS String
DIM i AS Integer
-
ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
sMountPoint = ClsGlobal.sSourceMnt
@@ -153,7 +156,8 @@
END IF
- SHELL "umount /dev/" & sDrive WAIT
+ SHELL "umount " & sMountPoint WAIT
+ 'SHELL "umount /dev/" & sDrive WAIT
'SHELL "umount " & sDrive WAIT
NEXT
@@ -177,15 +181,12 @@
END IF
'SHELL "umount /dev/" & clsglobal.sSourceMnt WAIT
SHELL "umount " & ClsGlobal.sSourceMnt WAIT
-
-
-
-
+
+
END IF
- 'NOW SEARCH FOR ISOS ON THE DRIVES
- ME.SCAN_LINUX_PARTITIONS()
+
@@ -194,15 +195,37 @@
PUBLIC SUB main()
-
- ME.MEDIA_SCAN
FMain.Show
- FMain.SkipTaskbar = TRUE
- FMain.Maximized = TRUE
- FMain.Resize(Desktop.Width, Desktop.Height)
+' FMain.Maximized = TRUE
+' FMain.Resize(Desktop.Width, Desktop.Height)
'FMain.tvPlan.MoveTo("Prep0")
FMain.tvPlan["Prep0"].Selected = TRUE
-
+'Balloon("Scanning drives for media ... please wait", fmain.pnlWinHost)
+FrmSelISO.tlDistroDesc.Text = "<b>Scanning system for installable
media. Please wait ...</b>"
+
+WAIT 1
+ FrmSelISO.lstInstallableImg.Enabled = FALSE
+ FrmSelISO.btResCan.Enabled = FALSE
+ fmain.btnext.Enabled = FALSE
+ fmain.btQuit.Enabled = FALSE
+ ME.SCAN_LINUX_PARTITIONS() ' find ISO's on the drives first
+ ME.MEDIA_SCAN
+ FrmSelISO.lstInstallableImg.Enabled = TRUE
+ FrmSelISO.btResCan.Enabled = TRUE
+ fmain.btnext.Enabled = TRUE
+ fmain.btQuit.Enabled = TRUE
+ IF FrmSelISO.lstInstallableImg.Count = 0 THEN
+ FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
+ FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any
installable media on your system. Please insert your VectorLinux " &
+ "installation CD and click \'" & FrmSelISO.btResCan.Text & "\' to
try again"
+ FMain.btnext.Enabled = FALSE
+ FMain.btnext.ForeColor = Color.Gray
+ ELSE
+ FMain.btnext.Enabled = TRUE
+ FMain.btnext.ForeColor = Color.Black
+ END IF
+
+
' FMain.tvPlan["Prep0"].Selected
END
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Mon Jul 21 14:56:10 2008
@@ -309,22 +309,25 @@
PUBLIC SUB fsTypes_click()
DIM cb AS ComboBox
-
-IF LAST.text = "Do not format"
- FOR EACH cb IN oMountPoints
- IF cb.tag = LAST.tag AND cb.text = "/" THEN
- Message.Error("The / partition MUST be formatted no matter
what. Please select a filesystem for this partition")
- 'default it to xfs
- LAST.text = "XFS"
- STOP EVENT
- END IF
- NEXT
- END IF
-
- 'PRINT "format " & LAST.tag & " as " & LAST.text
-
- ME.SET_PARTITION_FORMAT(LAST.tag, LAST.text)
-
+ FOR EACH cb IN oMountPoints
+ IF cb.Tag = LAST.tag THEN
+ SELECT CASE cb.Text
+ CASE "/"
+ ClsPartSel.fRoot = LAST.text
+ CASE "/home"
+ ClsPartSel.fhome = LAST.text
+ CASE "/var"
+ ClsPartSel.fVar = LAST.text
+ CASE "/tmp"
+ ClsPartSel.fTmp = LAST.text
+ CASE "/opt"
+ ClsPartSel.fOpt = LAST.text
+ CASE "/usr"
+ ClsPartSel.fUsr = LAST.text
+ END SELECT
+ END IF
+ NEXT
+
END
@@ -333,37 +336,70 @@
SELECT CASE sMountPoint
CASE "/"
FrmPartSel.sRootAddr = SPartition
+ ClsPartSel.sRoot = SPartition
CASE "/home"
FrmPartSel.sHomeAddr = SPartition
+ ClsPartSel.sHome = SPartition
CASE "/opt"
FrmPartSel.sOptAddr = SPartition
+ ClsPartSel.sOpt = SPartition
CASE "/usr"
FrmPartSel.sUsrAddr = SPartition
+ ClsPartSel.sUsr = SPartition
CASE "/var"
FrmPartSel.sVarAddr = SPartition
+ ClsPartSel.sVar = SPartition
CASE "/tmp"
FrmPartSel.sTmpAddr = SPartition
+ ClsPartSel.sTmp = SPartition
END SELECT
END
+PUBLIC SUB SET_LINUX_PARTITION_TYPES()
+
+ DIM cb AS ComboBox
+ DIM cc AS ComboBox
+ FOR EACH cb IN oMountPoints
+ FOR EACH cc IN oFsTypes
+ IF cb.tag = cc.tag THEN
+ ME.SET_PARTITION_FORMAT(cb.text, cc.Text)
+ END IF
+ NEXT
+ NEXT
+
+
+
+
+END
+
+
+
+
PUBLIC SUB SET_PARTITION_FORMAT(sMountPoint AS String, sFormat AS String)
SELECT CASE sMountPoint
CASE "/"
FrmPartSel.sRootFrmt = sFormat
+ ClsPartSel.fRoot = sFormat
CASE "/home"
FrmPartSel.sHomeFrmt = sFormat
+ ClsPartSel.fHome = sFormat
CASE "/opt"
FrmPartSel.sOptFrmt = sFormat
+ ClsPartSel.fOpt = sFormat
CASE "/usr"
FrmPartSel.sUsrFrmt = sFormat
+ ClsPartSel.fUsr = sFormat
CASE "/var"
FrmPartSel.sVarFrmt = sFormat
+ ClsPartSel.fVar = sFormat
CASE "/tmp"
FrmPartSel.sTrmFrmt = sFormat
+ ClsPartSel.fTmp = sFormat
END SELECT
-
+ 'Message("Set " & sMountPoint & " as " & sFormat)
+ 'Message(ClsPartSel.sRoot & ClsPartSel.fRoot)
END
Modified: branches/iVL/MdlPkgSel.module
==============================================================================
--- branches/iVL/MdlPkgSel.module (original)
+++ branches/iVL/MdlPkgSel.module Mon Jul 21 14:56:10 2008
@@ -112,7 +112,10 @@
PUBLIC SUB Packages_click()
- 'Message(LAST.tag)
+ IF ClsPkgSel.arrPkgs THEN
+ ClsPkgSel.arrPkgs.Clear
+ END IF
+ ME.GET_USER_PKG_SELECTION()
END
@@ -142,22 +145,44 @@
IF cb.Value = TRUE THEN
ClsPkgSel.arrBulks.Add(cb.tag)
END IF
- NEXT
+ NEXT ' just store them to the array for now. We will read the
array at install time
- FOR i = 0 TO ClsPkgSel.arrBulks.count - 1
- sItem = ClsPkgSel.arrBulks[i]
- IF sItem LIKE " " THEN
- ClsPkgSel.arrBulks.Delete(ClsPkgSel.arrBulks.Find(sItem))
- ELSE
- sList = sList & ", " & sItem
- ENDIF
- NEXT
- IF Left(sList) = "," THEN
- sList = Right(sList, Len(sList) - 1)
- ELSE IF Right(sList) = "," THEN
- sList = Left(sList, Len(sList) - 1)
- END IF
- sList = Trim(sList)
-
+ ' ' FOR i = 0 TO ClsPkgSel.arrBulks.count - 1
+ ' ' sItem = ClsPkgSel.arrBulks[i]
+ ' ' IF sItem LIKE " " THEN
+ ' ' ClsPkgSel.arrBulks.Delete(ClsPkgSel.arrBulks.Find(sItem))
+ ' ' ELSE
+ ' ' sList = sList & ", " & sItem
+ ' ' ENDIF
+ ' ' NEXT
+ ' ' IF Left(sList) = "," THEN
+ ' ' sList = Right(sList, Len(sList) - 1)
+ ' ' ELSE IF Right(sList) = "," THEN
+ ' ' sList = Left(sList, Len(sList) - 1)
+ ' ' END IF
+ ' ' sList = Trim(sList)
+ ' '
END
+
+PUBLIC SUB GET_USER_PKG_SELECTION()
+
+ DIM cb AS CheckBox
+ DIM sList, sItem AS String
+ DIM i AS Integer
+ ' simply get the list of packages into the array, and we will read
the array while installing packages.
+ ClsPkgSel.arrPkgs = NEW String[]
+ FOR EACH cb IN ME.Pkgs
+ IF cb.value = TRUE THEN
+ ClsPkgSel.arrPkgs.Add(cb.Tag)
+ END IF
+ NEXT
+
+
+
+
+
+
+
+END
+
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Mon Jul 21 14:56:10 2008
@@ -274,13 +274,7 @@
ClsPartSel.sSwap & Space(5) & "none" & Space(5) & "swap" & Space(5)
& "sw" & Space(5) & "0" & Space(5) & "0"
END IF
' Wheewww!... that's the whole fstab there... Please fix the win partitions
-
-
-
-
-
-
-
+
Modified: branches/iVL/MdlSummarize.module
==============================================================================
--- branches/iVL/MdlSummarize.module (original)
+++ branches/iVL/MdlSummarize.module Mon Jul 21 14:56:10 2008
@@ -18,9 +18,13 @@
PUBLIC SUB SUMMARIZE_INSTALL()
DIM sText AS String
+DIM i AS Integer
+ ' read each partition type
+ MdlPartSel.SET_LINUX_PARTITION_TYPES()
+ 'Message(ClsPartSel.fRoot)
- sText = "PARTITIONING LAYOUT:<br>" &
+ sText = "<b><br>PARTITIONING LAYOUT:</b><br>" &
ClsPartSel.sRoot & " = / (" & ClsPartSel.fRoot & ")<br>"
'"/ = " & ClsPartSel.sRoot & " <br>"
IF ClsPartSel.sHome THEN
@@ -39,25 +43,59 @@
sText = sText & ClsPartSel.sVar & " = /var (" & ClsPartSel.sVar & ")<br>"
END IF
- sText = sText & "<br><br><br><br>"
+ sText = sText & "<br><br>"
IF ClsWinDrives.sWinDrives THEN
- sText = sText & "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME.<br>"
+ sText = sText & "<b>OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT
BOOT TIME.</b><br>"
'list all the windows partitions here
+ sText = sText & ME.LIST_WINDOWS_PARTITIONS() & "<bb><br>"
END IF
IF ClsPkgSel.bCustom = TRUE THEN
- sText = sText & "INSTALL TYPE: Custom<br>"
+ sText = sText & "<b>INSTALL TYPE:</b> Custom<br>"
+
+ sText = sText & "<br><b>BULK PACKAGES:</b> "
+ FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
+ sText = sText & "<br>" & Right(ClsPkgSel.arrBulks[i],
Len(ClsPkgSel.arrBulks[i]) - RInStr(ClsPkgSel.arrBulks[i], "/"))
+ NEXT
+ sText = sText & "<br><br><b>OPTIONAL PACKAGES:</b>"
+ FOR i = 0 TO ClsPkgSel.arrPkgs.Count - 1
+ sText = sText & "<br>" & Right(ClsPkgSel.arrPkgs[i],
Len(ClsPkgSel.arrPkgs[i]) - RInStr(ClsPkgSel.arrPkgs[i], "/"))
+ NEXT
+
ELSE
- sText = sText & "INSTALL TYPE: Full<br>"
+ sText = sText & "<b>INSTALL TYPE:</b> Full<br>"
END IF
-
-
-
-
-
+
+
+
+
FrmSummary.tlSummary.Text = sText
+
END
+
+ PUBLIC FUNCTION LIST_WINDOWS_PARTITIONS() AS String
+
+ DIM sPart, sMntPnt, sLine, sRet, sNewLine AS String
+ DIM i AS Integer
+ IF ClsWinDrives.sWinDrives THEN
+ FOR i = 0 TO ClsWinDrives.sWinDrives.Count - 1
+ sLine = ClsWinDrives.sWinDrives[i]
+ spart = Trim(Left(sLine, InStr(sLine, "|") - 1))
+ sMntPnt = Right(sLine, Len(sLine) - InStr(sLine, "|"))
+ sRet = sRet & gb.NewLine & spart & " will be mounted to " & sMntPnt
+ 'Message.Info(sLine)
+ NEXT
+ sRet = Trim(sRet)
+ RETURN sRet
+ END IF
+
+
+
+
+
+END
+
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Mon Jul 21 14:56:10 2008
@@ -209,6 +209,7 @@
DIM sLine AS String
FOR i = 0 TO ClsWinDrives.sWinDrives.Count - 1
sLine = ClsWinDrives.sWinDrives[i]
+ 'FORMAT: <partition_address>|<mount_point>
IF Left(sLine, InStr(sLine, "|") - 1) = sTag THEN
sLine = sTag & "|" & sMntPoint
PRINT sLine
Modified: branches/iVL/images/installer.png
==============================================================================
Binary files. No diff available.
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-07-21 05:04:56
|
Author: M0...@gm...
Date: Sun Jul 20 22:04:43 2008
New Revision: 65
Modified:
branches/iVL/.project
branches/iVL/MdlPartSel.module
branches/iVL/installer.gambas
Log:
Attempt to fix problem with a single partition found
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Sun Jul 20 22:04:43 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.26
+Version=0.0.27
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Sun Jul 20 22:04:43 2008
@@ -50,7 +50,8 @@
y = 4
x = 8
- IF InStr(sDump1, gb.NewLine) > 0 THEN
+' IF InStr(sDump1, gb.NewLine) > 0 THEN
+ IF sDump1 <> "" THEN
sPartList = Split(sDump1, gb.NewLine)
' create header labels
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-07-21 01:35:53
|
Author: M0...@gm...
Date: Sun Jul 20 18:34:19 2008
New Revision: 64
Modified:
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/FMain.class
branches/iVL/FMain.form
branches/iVL/FrmPkgSel.class
branches/iVL/FrmPkgSel.form
branches/iVL/FrmPkgsel2.class
branches/iVL/FrmPkgsel2.form
branches/iVL/FrmWinDrives.class
branches/iVL/MdlCore.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlWinDrives.module
branches/iVL/installer.gambas
Log:
Small cosmetic fixes. Updated navigation procedure. More progress in
the summary to make the jump to install.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FMain.class
+# /home/vluser/area-51/projects/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:198
+#: FMain.class:197
msgid "Process Overview"
msgstr ""
-#: FMain.class:211
+#: FMain.class:210
msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:221
+#: FMain.class:220
msgid "Next"
msgstr ""
-#: FMain.class:227
+#: FMain.class:226
msgid "Back"
msgstr ""
-#: FMain.class:233
+#: FMain.class:232
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPkgSel.class
+# /home/vluser/area-51/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPkgSel.class:84
+#: FrmPkgSel.class:88
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:90
+#: FrmPkgSel.class:94
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:95
+#: FrmPkgSel.class:99
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmWinDrives.class
+# /home/vluser/area-51/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,7 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmWinDrives.class:65
+#: FrmWinDrives.class:66
msgid "Select the windows partitions you would like to mount during boot"
msgstr ""
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Sun Jul 20 18:34:19 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlWinDrives.module
+# /home/vluser/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Sun Jul 20 18:34:19 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.18
+Version=0.0.26
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Sun Jul 20 18:34:19 2008
@@ -82,15 +82,11 @@
WITH ME
.tlBanner.width = ME.width
- '.Frame1.Move(.tlBanner.left + 4, .tlBanner.Top + .tlBanner.Height
+ 4, .tlBanner.Width - ((.tlBanner.Width / 10) * 7), .Height -
(.tlbanner.height + (.tlbanner.height / 2)))
.Frame1.Resize(MdlCore.iLeftWidth * 1.60, .ClientHeight -
tlBanner.Height - (.btback.Height * 1.5))
.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
- '.tvPlan.Resize(.Frame1.Width - (.Frame1.Width / 20),
Frame1.Height - (.Frame1.Height / 20))
- '.tvPlan.Resize(.Frame1.Width - 20, .Frame1.Height - 36)
- '.tvPlan.Width = MdlCore.iLeftWidth + (MdlCore.iLeftWidth / 20)
- '.Frame1.Width = .tvPlan.Width + (.tvPlan.Width / 20)
.pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlbanner.height + (.btback.height * 2)))
- .btback.Move(.pnlWinHost.Left, .pnlWinHost.Top
+ .pnlWinHost.Height - (.btback.Height),
MdlObjSizer.get_object_width(.btback.text) + 36)
+ .btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
+ '.btback.Move(.pnlWinHost.Left, .pnlWinHost.Top
+ .pnlWinHost.Height - (.btback.Height),
MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
' we want that one right in the middle
@@ -163,6 +159,9 @@
MdlSummarize.SUMMARIZE_INSTALL
frmNext = FrmSummary
'frmNext = install
+ CASE "FrmWinDrives"
+ 'Move on to selecting packages
+ frmNext = FrmPkgSel
END SELECT
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Sun Jul 20 18:34:19 2008
@@ -23,17 +23,17 @@
MoveScaled(28,9,66,56)
}
{ btnext Button
- MoveScaled(89,69,8,3.1667)
+ MoveScaled(49,67,8,3.1111)
Text = ("Next")
Picture = Picture["icon:/16/right"]
}
{ btback Button
- MoveScaled(28,67,8,3.1667)
+ MoveScaled(28,67,8,3.1111)
Text = ("Back")
Picture = Picture["icon:/16/left"]
}
{ btQuit Button
- MoveScaled(54,67,11,3.1667)
+ MoveScaled(38,67,11,3.1111)
Text = ("Exit")
Picture = Picture["icon:/16/cancel"]
}
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Sun Jul 20 18:34:19 2008
@@ -23,6 +23,10 @@
.rbFull_Click()
END WITH
FMain.FrmCurr = ME
+ FMain.tvPlan["Prep2"].Selected = TRUE
+ FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
+
END
PUBLIC SUB Form_Resize()
@@ -32,7 +36,7 @@
.rbFull.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8,
MdlObjSizer.get_object_width(.rbfull.text) + 36)
.rbCustom.Move(.tlBanner.Left, .rbFull.top + .rbFull.Height + 4,
MdlObjSizer.get_object_width(.rbcustom.text) + 36)
.tlActionDesc.Width = .tlBanner.Width - 4
- .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top
+ .tlActionDesc.Height + 8, .tlActionDesc.Width, .ClientHeight -
(.tlActionDesc.top + (.tlActionDesc.height * 1.5)))
+ .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top
+ .tlActionDesc.Height + 8, .tlActionDesc.Width - 12, .ClientHeight -
(.tlActionDesc.top + (.tlActionDesc.height * 2)))
END WITH
Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form (original)
+++ branches/iVL/FrmPkgSel.form Sun Jul 20 18:34:19 2008
@@ -9,18 +9,18 @@
Alignment = Align.Normal
}
{ rbFull RadioButton
- MoveScaled(1,8,40,4.5)
+ MoveScaled(1,8,40,3)
Text = ("Full Install")
}
{ rbCustom RadioButton
- MoveScaled(1,14,55,4.5)
+ MoveScaled(1,11,55,3)
Text = ("Custom Install")
}
{ tlActionDesc TextLabel
- MoveScaled(1,21,63,7)
+ MoveScaled(1,15,63,7)
Text = ("")
}
{ scrlInstallOpts ScrollView
- MoveScaled(1,30,52,28)
+ MoveScaled(1,24,52,28)
}
}
Modified: branches/iVL/FrmPkgsel2.class
==============================================================================
--- branches/iVL/FrmPkgsel2.class (original)
+++ branches/iVL/FrmPkgsel2.class Sun Jul 20 18:34:19 2008
@@ -32,13 +32,8 @@
WITH ME
.tlbanner.Width = .ClientWidth - 16
- '.tlbanner.Move(.ClientX + 4, .clienty + 4, .ClientWidth - 18)
- '.tlbanner.Move(4, 16, FrmPartSel.scrollPartitions.Width - 60)
- .scrPkgs.Move(.tlbanner.Left, .tlbanner.top + (.tlbanner.Height *
2), .tlbanner.Width - 4, .ClientH - (.tlbanner.Height *
1.5)) ', .tlbanner.Width - 8, .ClientHeight - .tlbanner.height - 8)
- '.scrPkgs.Resize(FrmPkgSel.scrlInstallOpts.Width, .ClientHeight - (.tlbanner.Height))
-' .VPanel1.Move(2, .tlbanner.Height * 2)
- '.scrPkgs.Width = .tlbanner.Width
- '.scrPkgs.Height = .ClientHeight - .tlbanner.Height - 4
+ .scrPkgs.Move(.tlbanner.Left, .tlbanner.top + (.tlbanner.Height *
1.5), .tlbanner.Width - 4, .ClientHeight - (.tlbanner.Height *
4)) ', .tlbanner.Width - 8, .ClientHeight - .tlbanner.height - 8)
+
END WITH
END
@@ -53,6 +48,12 @@
END WITH
FMain.FrmCurr = ME
MdlPkgSel.LIST_PACKAGE_SELECTION()
+
+
+END
+
+PUBLIC SUB scrPkgs_MouseDown()
+
END
Modified: branches/iVL/FrmPkgsel2.form
==============================================================================
--- branches/iVL/FrmPkgsel2.form (original)
+++ branches/iVL/FrmPkgsel2.form Sun Jul 20 18:34:19 2008
@@ -4,7 +4,7 @@
MoveScaled(0,0,64,64)
Text = ("")
{ tlbanner TextLabel
- MoveScaled(1,1,23,6)
+ MoveScaled(1,1,43,5)
Text = ("TextLabel1")
}
{ scrPkgs ScrollView
Modified: branches/iVL/FrmWinDrives.class
==============================================================================
--- branches/iVL/FrmWinDrives.class (original)
+++ branches/iVL/FrmWinDrives.class Sun Jul 20 18:34:19 2008
@@ -21,6 +21,7 @@
ME.Resize(ME.ClientWidth - 12, ME.ClientH - 12)
MdlWinDrives.LIST_WIN_PARTITIONS
'ME.Resize(ME.Parent.Width - 12, ME.Parent.Height - 12)
+ FMain.FrmCurr = ME
END
@@ -30,7 +31,7 @@
WITH ME
.tlBanner.Width = .ClientW - 4
'.svWinDrives.Resize(.ClientWidth - 4, .ClientHeight -
(.tlBanner.Width * 1.5))
- .svWinDrives.Move(.tlBanner.Left, .tlBanner.top +
(.tlBanner.Height + 4), .tlBanner.Width - 8, .ClientH -
(.tlbanner.height * 2))
+ .svWinDrives.Move(.tlBanner.Left, .tlBanner.top +
(.tlBanner.Height + 4), .tlBanner.Width - 20, .ClientH -
(.tlbanner.height * 2))
END WITH
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Sun Jul 20 18:34:19 2008
@@ -444,8 +444,8 @@
.Add("Prep", "Preparation", sCatPic)
.Add("Prep0", "Find installation media", sNowPic, "Prep")
.Add("Prep1", "Disk Partitioning", sToDopic, "Prep")
- .Add("Prep2", "Regional Setup", sToDopic, "Prep")
- .Add("Prep3", "Desktop Selection", sToDopic, "Prep")
+ .Add("Prep2", "Software Selection", sToDopic, "Prep")
+ '.Add("Prep3", "Desktop Selection", sToDopic, "Prep")
.Add("Inst", "Installation", sCatPic)
.Add("Inst0", "Installation Summary", sToDopic, "Inst")
.Add("Inst1", "Install Operating System", sToDopic, "Inst")
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Sun Jul 20 18:34:19 2008
@@ -184,7 +184,7 @@
spart = Trim(sSwapList)
'SHELL "export " & sSwapList & "=$(df -h | grep -i swap) |
cut -f 2 -d \' \'" TO vSwapSize
SHELL " export sw=$(probepart | grep -i \" *swap$\") && echo
$sw | cut -f 4 -d \' \'" TO vSwapSize
-
+
iswapsize = CInt(vSwapSize)
iswapsize = Round(iswapsize / 1024 / 1024, -2)
'now create the swap label and combo box
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Sun Jul 20 18:34:19 2008
@@ -57,12 +57,31 @@
.Height = 27
.Width = MdlObjSizer.get_object_width(.Text)
.x = FrmWinDrives.svWinDrives.Width / 2 - (.Width / 2)
-
.y = y
cbx = .x + .Width - (.Width / 2)
END WITH
- y = y + tl.Height * 2
+
+ y = y + tl.Height + 8
+ tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "Headers"
+ WITH tl
+ .x = x
+ .y = y
+ .text = "<B>PARTITION</B>"
+ .Width = MdlObjSizer.get_object_width(.Text) * 1.5
+ .Height = 27
+ END WITH
+ cbx = x + (tl.Width) * 2
+ tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "Headers"
+ WITH tl
+ .x = cbx
+ .y = y
+ .text = "<b>MOUNT TO </B>"
+ .Width = MdlObjSizer.get_object_width(.Text) * 1.5
+ .Height = 27
+ END WITH
+ y = y + tl.Height + 8
+
'END IF
IF InStr(sDump1, gb.NewLine) THEN ' more than one partition found
sPartList = Split(sDump1, gb.NewLine) ' multiple partitions found
@@ -87,9 +106,9 @@
.Width = MdlObjSizer.get_object_width(.Text) ' * 1.5
.Tag = sPartList[i]
.Height = 27
- .x = FrmPartSel.tlPartRow.Left
+ .x = x 'FrmPartSel.tlPartRow.Left
.y = y
- cbx = .x + tl.Width * 1.5
+
IF .Width > lbwidth THEN
lbwidth = .Width
ELSE
@@ -107,17 +126,18 @@
.Tag = sPartList[i]
.Height = 27
'.x = FrmPartSel.scrollPartitions.Width /
2 'lbwidth + 12
- .x = FrmPartSel.tlPartRow2.Left
+ .x = cbx 'x + tl.Width + 8 'FrmPartSel.tlPartRow2.Left
.y = tl.Top
.Add("/mnt" &/ sPart)
- .Width = MdlObjSizer.get_object_width("/mnt" &/
sPart) * 2
+ .Add("Do not mount")
+ .Width = MdlObjSizer.get_object_width("Do not
mount") * 2
.ReadOnly = FALSE
' .border = border.Plain
ME.oWMntPoints.Add(cb)
END WITH
y = y + tl.Height + 4
-
+ '
NEXT
@@ -182,10 +202,6 @@
ME.UPDATE_WIN_ARRAY(LAST.tag, Trim(LAST.text))
END
-
-
-
-
PUBLIC SUB UPDATE_WIN_ARRAY(sTag AS String, sMntPoint AS String)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-07-20 23:47:27
|
Author: M0...@gm...
Date: Sun Jul 20 16:47:00 2008
New Revision: 63
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/FMain.class
branches/iVL/FMain.form
branches/iVL/MdlPartSel.module
branches/iVL/MdlSummarize.module
Log:
Begin summarizing install. Preparing the way for package installation
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Sun Jul 20 16:47:00 2008
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:192
+#: FMain.class:198
msgid "Process Overview"
msgstr ""
-#: FMain.class:205
-msgid "Vector Linux Install"
+#: FMain.class:211
+msgid "VectorLinux Install"
msgstr ""
-#: FMain.class:215
+#: FMain.class:221
msgid "Next"
msgstr ""
-#: FMain.class:221
+#: FMain.class:227
msgid "Back"
msgstr ""
-#: FMain.class:227
+#: FMain.class:233
msgid "Exit"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Sun Jul 20 16:47:00 2008
@@ -155,8 +155,14 @@
ELSE
' now we are ready to summarize
Message("Going for a simple install")
+ MdlSummarize.SUMMARIZE_INSTALL
frmNext = FrmSummary
END IF
+ CASE "FrmPkgsel2"
+ ' summarize the build
+ MdlSummarize.SUMMARIZE_INSTALL
+ frmNext = FrmSummary
+ 'frmNext = install
END SELECT
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Sun Jul 20 16:47:00 2008
@@ -16,24 +16,24 @@
Font = Font["+6"]
Background = Color.SelectedBackground
Foreground = Color.SelectedForeground
- Text = ("Vector Linux Install")
+ Text = ("VectorLinux Install")
Alignment = Align.Center
}
{ pnlWinHost VBox
MoveScaled(28,9,66,56)
}
{ btnext Button
- MoveScaled(89,69,8,3.3333)
+ MoveScaled(89,69,8,3.1667)
Text = ("Next")
Picture = Picture["icon:/16/right"]
}
{ btback Button
- MoveScaled(28,67,8,3.3333)
+ MoveScaled(28,67,8,3.1667)
Text = ("Back")
Picture = Picture["icon:/16/left"]
}
{ btQuit Button
- MoveScaled(54,67,11,3.3333)
+ MoveScaled(54,67,11,3.1667)
Text = ("Exit")
Picture = Picture["icon:/16/cancel"]
}
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Sun Jul 20 16:47:00 2008
@@ -56,7 +56,7 @@
' create header labels
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
WITH tl
- .Text = "PARTITION"
+ .Text = "<b>PARTITION</b>"
.Height = 27
.x = x
.y = y
@@ -66,7 +66,7 @@
icol2 = x + tl.Width + 4
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
WITH tl
- .text = "MOUNT POINT"
+ .text = "<b>MOUNT POINT</b>"
.Height = 27
.x = icol2
.y = y
@@ -75,7 +75,7 @@
icol3 = tl.x + tl.Width + 4
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
WITH tl
- .text = "FILESYSTEM"
+ .text = "<b>FILESYSTEM</b>"
.Height = 27
.x = icol3
.y = y
Modified: branches/iVL/MdlSummarize.module
==============================================================================
--- branches/iVL/MdlSummarize.module (original)
+++ branches/iVL/MdlSummarize.module Sun Jul 20 16:47:00 2008
@@ -17,6 +17,47 @@
PUBLIC SUB SUMMARIZE_INSTALL()
+DIM sText AS String
+
+
+ sText = "PARTITIONING LAYOUT:<br>" &
+ ClsPartSel.sRoot & " = / (" & ClsPartSel.fRoot & ")<br>"
+ '"/ = " & ClsPartSel.sRoot & " <br>"
+ IF ClsPartSel.sHome THEN
+ sText = sText & ClsPartSel.sHome & " = /home (" &
ClsPartSel.fhome & ")<br>"
+ END IF
+ IF ClsPartSel.sOpt THEN
+ sText = sText & ClsPartSel.sOpt & " = /opt (" & ClsPartSel.fOpt & ")<br>"
+ END IF
+ IF ClsPartSel.sUsr THEN
+ sText = sText & ClsPartSel.sUsr & " = /usr (" & ClsPartSel.fUsr & ")<br>"
+ END IF
+ IF ClsPartSel.sTmp THEN
+ sText = sText & ClsPartSel.sTmp & " = /tmp (" & ClsPartSel.fTmp & ")<br>"
+ END IF
+ IF ClsPartSel.sVar THEN
+ sText = sText & ClsPartSel.sVar & " = /var (" & ClsPartSel.sVar & ")<br>"
+ END IF
+
+ sText = sText & "<br><br><br><br>"
+
+ IF ClsWinDrives.sWinDrives THEN
+ sText = sText & "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME.<br>"
+ 'list all the windows partitions here
+ END IF
+
+ IF ClsPkgSel.bCustom = TRUE THEN
+ sText = sText & "INSTALL TYPE: Custom<br>"
+ ELSE
+ sText = sText & "INSTALL TYPE: Full<br>"
+ END IF
+
+
+
+
+
+ FrmSummary.tlSummary.Text = sText
+
END
|
|
From: <cod...@go...> - 2008-07-20 23:16:14
|
Author: M0...@gm...
Date: Sun Jul 20 16:16:10 2008
New Revision: 62
Modified:
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartScheme.form
branches/iVL/FrmPartSel.class
Log:
Minor cosmetic fixes to the partiton shceme window
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Sun Jul 20 16:16:10 2008
@@ -23,7 +23,7 @@
.tlBanner.Width = .ClientWidth - 10
.rbUseExisting.Move(.tlBanner.Left, .tlBanner.Top
+ .tlBanner.Height + 8)
.rbEditPartitions.Move(.rbUseExisting.Left, .rbUseExisting.Top
+ .rbUseExisting.Height + 4)
- .tlChoiceExp.Move(.rbEditPartitions.Left, .rbEditPartitions.top
+ .rbEditPartitions.Height + 16, .tlBanner.Width - 10)
+ .tlChoiceExp.Move(.rbEditPartitions.Left, .rbEditPartitions.top
+ .rbEditPartitions.Height * 4, .tlBanner.Width - 10)
END WITH
@@ -47,7 +47,7 @@
PUBLIC SUB rbUseExisting_Click()
- ME.tlChoiceExp.Text = "<b>" & rbUseExisting.Text & "</b><br><br>" &
+ ME.tlChoiceExp.Text = "<b>" & UCase(rbUseExisting.Text)
& "</b><br><br>" &
"Select this option if you already have a linux installation that
you wish to overwrite or if a linux partition scheme exists in your " &
"Hard disk. <b>This option will overwrite whatever is in those
partitions</b><br><br>" &
"<i>Use this option if you already prepared your partitions using
the VectorLinux installer</i>"
@@ -57,7 +57,7 @@
PUBLIC SUB rbEditPartitions_Click()
- ME.tlChoiceExp.Text = "<b>" & rbEditPartitions.Text & "</b><br><br>" &
+ ME.tlChoiceExp.Text = "<b>" & UCase(rbEditPartitions.Text)
& "</b><br><br>" &
"Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux " &
"installation. This option is the safest choice if you have other
existing installations that you wish to keep."
FMain.frmNext = FrmDiskPart
Modified: branches/iVL/FrmPartScheme.form
==============================================================================
--- branches/iVL/FrmPartScheme.form (original)
+++ branches/iVL/FrmPartScheme.form Sun Jul 20 16:16:10 2008
@@ -8,15 +8,15 @@
Text = ("Select your disk partition option")
}
{ rbUseExisting RadioButton
- MoveScaled(2,7,32,3.375)
+ MoveScaled(2,7,32,3.3333)
Text = ("Use existing disk partitions")
}
{ rbEditPartitions RadioButton
- MoveScaled(2,12,62,3.375)
+ MoveScaled(2,12,62,3.3333)
Text = ("Modify my disk partitions to make room for new installation")
}
{ tlChoiceExp TextLabel
- MoveScaled(1,17,76,23)
+ MoveScaled(1,20,76,23)
Text = ("TextLabel1")
}
}
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Sun Jul 20 16:16:10 2008
@@ -37,7 +37,7 @@
DIM iWidth AS Integer = 0
WITH ME
.tlBanner.Width = .ClientWidth - 16
- .scrollPartitions.Resize(.ClientWidth - 12, .ClientHeight
- .tlBanner.Height - (cbDoWin.Height * 2))
+ .scrollPartitions.Resize(.tlBanner.Width - 4, .ClientHeight
- .tlBanner.Height - (cbDoWin.Height * 3))
.cbDoWin.Move(.scrollPartitions.Left, .ClientHeight
- .cbDoWin.Height - 8)
' .tlPartRow.Move(4, 4)
' .tlPartRow2.Move(.tlPartRow.Left + (.tlPartRow.Width * 1.5), .tlPartRow.top)
|
|
From: <cod...@go...> - 2008-07-20 23:11:13
|
Author: M0...@gm...
Date: Sun Jul 20 16:10:16 2008
New Revision: 61
Modified:
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/FrmPartSel.class
branches/iVL/FrmPartSel.form
branches/iVL/MdlPartSel.module
Log:
Fixed problem in FrmPartSel and MdlPartSel to make sure virtual objects
are perfectly aligned. Just a cosmetic fix
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FMain.class
+# /root/gui-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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FrmPartSel.class
+# /root/gui-installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,27 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:146
+#: FrmPartSel.class:143
msgid "Define where the operating system will be
installed\n<br>\nLinux is a modular operating system. This means that
it has the ability to keep system and user data separately.<br> A
recommended setup would included a / (root), a /home, and a swap
partitions.\n<br>\nPlease select which partitions you would like to use
for your install"
msgstr ""
-#: FrmPartSel.class:154
-msgid "<b>Partition</b>"
-msgstr ""
-
-#: FrmPartSel.class:160
-msgid "<b>Mount Point</b>"
-msgstr ""
-
-#: FrmPartSel.class:166
-msgid "<b>File System</b>"
-msgstr ""
-
-#: FrmPartSel.class:173
+#: FrmPartSel.class:152
msgid "Check this box if you have a Windows installation on your
system or any other windows partition (FAT, FAT32, NTFS) that you want
auto-mounted as soon as your computer starts"
msgstr ""
-#: FrmPartSel.class:174
+#: FrmPartSel.class:153
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr ""
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/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 Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/MdlWinDrives.module
+# /root/gui-installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Sun Jul 20 16:10:16 2008
@@ -39,9 +39,9 @@
.tlBanner.Width = .ClientWidth - 16
.scrollPartitions.Resize(.ClientWidth - 12, .ClientHeight
- .tlBanner.Height - (cbDoWin.Height * 2))
.cbDoWin.Move(.scrollPartitions.Left, .ClientHeight
- .cbDoWin.Height - 8)
- .tlPartRow.Move(4, 4)
- .tlPartRow2.Move(.tlPartRow.Left + (.tlPartRow.Width * 1.5), .tlPartRow.top)
- .tlPartRow3.Move(.tlPartRow2.left + (.tlPartRow3.Width * 1.9), .tlPartRow.top)
+' .tlPartRow.Move(4, 4)
+' .tlPartRow2.Move(.tlPartRow.Left + (.tlPartRow.Width * 1.5), .tlPartRow.top)
+' .tlPartRow3.Move(.tlPartRow2.left + (.tlPartRow3.Width * 1.9), .tlPartRow.top)
' .tlPartRow.Move(4, 4)
' .tlPartRow3.Move(ME.scrollPartitions.Left +
ME.scrollPartitions.Width - (.tlPartRow3.Width * 2), .tlpartrow.top)
' .tlPartRow2.Move((.tlPartRow.Width + .tlPartRow3.Left) / 3, tlpartrow.top)
Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form (original)
+++ branches/iVL/FrmPartSel.form Sun Jul 20 16:10:16 2008
@@ -9,24 +9,9 @@
}
{ scrollPartitions ScrollView
MoveScaled(1,16,69,33)
- { tlPartRow TextLabel
- MoveScaled(1,1,14,3)
- Text = ("<b>Partition</b>")
- Alignment = Align.Left
- }
- { tlPartRow2 TextLabel
- MoveScaled(19,1,14,3)
- Text = ("<b>Mount Point</b>")
- Alignment = Align.Left
- }
- { tlPartRow3 TextLabel
- MoveScaled(39,1,14,3)
- Text = ("<b>File System</b>")
- Alignment = Align.Left
- }
}
{ cbDoWin CheckBox
- MoveScaled(1,50,57,3.375)
+ MoveScaled(1,50,57,3.3333)
ToolTip = ("Check this box if you have a Windows installation on
your system or any other windows partition (FAT, FAT32, NTFS) that you
want auto-mounted as soon as your computer starts")
Text = ("Detect and Setup Windows partitions for auto-mounting at boot")
}
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Sun Jul 20 16:10:16 2008
@@ -27,7 +27,7 @@
DIM sPart AS String
DIM sSize AS String
DIM i AS Integer
- DIM y AS Integer
+ DIM x, y AS Integer
DIM sDump1 AS String ' partition list dump
DIM lbwidth AS Integer = 0
DIM sSwapList AS String
@@ -36,6 +36,7 @@
DIM i3drdrowX AS Integer
DIM iX AS Integer
DIM iWidth AS Integer
+ DIM iCol1, icol2, iCol3 AS Integer
' fire up the arrays
oFsTypes = NEW Object[]
oMountPoints = NEW Object[]
@@ -46,10 +47,44 @@
sDump1 = Trim(sDump1)
- y = FrmPartSel.tlPartRow.top + FrmPartSel.tlPartRow.Height + 8
+ y = 4
+ x = 8
IF InStr(sDump1, gb.NewLine) > 0 THEN
sPartList = Split(sDump1, gb.NewLine)
+
+ ' create header labels
+ tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
+ WITH tl
+ .Text = "PARTITION"
+ .Height = 27
+ .x = x
+ .y = y
+ .Width = MdlObjSizer.get_object_width(.text) * 2.5
+ END WITH
+ icol1 = x
+ icol2 = x + tl.Width + 4
+ tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
+ WITH tl
+ .text = "MOUNT POINT"
+ .Height = 27
+ .x = icol2
+ .y = y
+ .Width = MdlObjSizer.get_object_width(.text) * 2.5
+ END WITH
+ icol3 = tl.x + tl.Width + 4
+ tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
+ WITH tl
+ .text = "FILESYSTEM"
+ .Height = 27
+ .x = icol3
+ .y = y
+ .Width = MdlObjSizer.get_object_width(.text) * 2.5
+ END WITH
+ y = y + 20
+
+
+
FOR i = 0 TO sPartList.Count - 1
sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))
'Message.Info(sPart)
@@ -77,7 +112,7 @@
.Width = lbwidth
END IF
.Height = 27
- .x = FrmPartSel.tlPartRow.Left
+ .x = icol1 'FrmPartSel.tlPartRow.Left
.Alignment = Align.Normal
.y = y
END WITH
@@ -87,7 +122,7 @@
WITH cb
.tag = Trim(sPartList[i])
'.x = lbwidth + 24
- .X = FrmPartSel.tlPartRow2.Left
+ .X = icol2 'FrmPartSel.tlPartRow2.Left
.y = y
.Height = tl.Height
.Width = tl.Width
@@ -108,7 +143,7 @@
WITH cb
.Tag = Trim(sPartList[i])
'.x = i3drdrowX
- .x = FrmPartSel.tlPartRow3.Left
+ .x = iCol3 'FrmPartSel.tlPartRow3.Left
.y = y
.ReadOnly = TRUE
.Width = tl.Width
@@ -156,7 +191,7 @@
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "swlabel"
WITH tl
'.x = .Parent.x
- .x = FrmPartSel.tlPartRow.Left
+ .x = icol1 'FrmPartSel.tlPartRow.Left
.y = y
.Text = sPart & " ( " & CStr(iswapsize) & "G )"
.Width = lbwidth
@@ -172,7 +207,7 @@
WITH cb
.y = y
'.x = lbwidth + 24
- .x = FrmPartSel.tlPartRow2.Left
+ .x = icol2 'FrmPartSel.tlPartRow2.Left
.Width = tl.Width
.tag = "swapSelection"
.ReadOnly = TRUE
|
|
From: <cod...@go...> - 2008-07-20 06:39:06
|
Author: m0...@gm... Date: Sat Jul 19 23:38:14 2008 New Revision: 60 Modified: 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 Log: minor changes Modified: branches/iVL/.lang/ClsGlobal.pot ============================================================================== --- branches/iVL/.lang/ClsGlobal.pot (original) +++ branches/iVL/.lang/ClsGlobal.pot Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/ClsGlobal.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/ClsPartSel.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/ClsWinDrives.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/FMain.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/FrmDiskPart.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/FrmLicense.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/FrmPartScheme.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/FrmPartSel.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/FrmPkgSel.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/FrmSelISO.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/FrmSummary.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/FrmWinDrives.class +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/MdlCore.module +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/MdlDiskPart.module +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/MdlObjSizer.module +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/MdlPartSel.module +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/MdlPkgSel.module +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/MdlSetup.module +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/MdlSummarize.module +# /root/new-inst/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 Sat Jul 19 23:38:14 2008 @@ -1,4 +1,4 @@ -# /home/vluser/area-51/projects/installer/MdlWinDrives.module +# /root/new-inst/MdlWinDrives.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
|
From: <cod...@go...> - 2008-07-20 05:57:03
|
Author: M0...@gm...
Date: Sat Jul 19 22:56:35 2008
New Revision: 59
Modified:
branches/iVL/.project
branches/iVL/MdlCore.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Sat Jul 19 22:56:35 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.17
+Version=0.0.18
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Sat Jul 19 22:56:35 2008
@@ -90,7 +90,7 @@
DIM sPartition AS String
'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \'
\'" TO sResults
- SHELL " /sbin/probepart | grep -e \" *Linux$\" | cut -f 1 -d \' \'"
TO sResults
+ SHELL " /sbin/probepart | grep -e \" *Linux$\" | cut -f 1 -d \' \' |
grep -e \" /dev\"" TO sResults
sResults = Trim(sResults)
'Message.Info(sResults)
IF InStr(sResults, gb.NewLine) THEN
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Sat Jul 19 22:56:35 2008
@@ -42,7 +42,7 @@
' We will mount the partitions first, and then figure out their size
- SHELL " probepart | grep -e \" Linux$\" | cut -f 1 -d \' \'" TO sDump1
+ SHELL " probepart | grep -e \" Linux$\" | cut -f 1 -d \' \' | grep
/dev" TO sDump1
sDump1 = Trim(sDump1)
@@ -139,7 +139,7 @@
END IF
- SHELL " probepart | grep -i \" *swap$\" | cut -f 1 -d \' \'" TO sSwapList
+ SHELL " probepart | grep -i \" *swap$\" | cut -f 1 -d \' \' |
grep -e /dev" TO sSwapList
sSwapList = Trim(sSwapList)
'Message.Info(sSwapList)
IF InStr(sSwapList, gb.NewLine) THEN
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Sat Jul 19 22:56:35 2008
@@ -54,8 +54,8 @@
DIM sFATList AS String
DIM sFAT32List AS String
- SHELL "probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\'" TO sFAT32List
- SHELL "probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'" TO sFATList
+ SHELL "probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\' |
grep -e \"/dev\"" TO sFAT32List
+ SHELL "probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'|grep -e
\" /dev\"" TO sFATList
sFAT32List = Trim(sFAT32List)
sFATList = Trim(sFATList)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-07-20 05:49:02
|
Author: M0...@gm...
Date: Sat Jul 19 22:48:17 2008
New Revision: 58
Added:
branches/iVL/FrmPkgsel2.class
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/FrmPkgSel.form
branches/iVL/MdlCore.module
Log:
Fixed bug where partitions were not getting detected in virtual machines.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Sat Jul 19 22:48:17 2008
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:173
+#: FMain.class:192
msgid "Process Overview"
msgstr ""
-#: FMain.class:186
+#: FMain.class:205
msgid "Vector Linux Install"
msgstr ""
-#: FMain.class:196
+#: FMain.class:215
msgid "Next"
msgstr ""
-#: FMain.class:202
+#: FMain.class:221
msgid "Back"
msgstr ""
-#: FMain.class:208
+#: FMain.class:227
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Sat Jul 19 22:48:17 2008
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPkgSel.class:77
+#: FrmPkgSel.class:84
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:83
+#: FrmPkgSel.class:90
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:88
+#: FrmPkgSel.class:95
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form (original)
+++ branches/iVL/FrmPkgSel.form Sat Jul 19 22:48:17 2008
@@ -9,11 +9,11 @@
Alignment = Align.Normal
}
{ rbFull RadioButton
- MoveScaled(1,8,40,4.4444)
+ MoveScaled(1,8,40,4.5)
Text = ("Full Install")
}
{ rbCustom RadioButton
- MoveScaled(1,14,55,4.4444)
+ MoveScaled(1,14,55,4.5)
Text = ("Custom Install")
}
{ tlActionDesc TextLabel
@@ -21,6 +21,6 @@
Text = ("")
}
{ scrlInstallOpts ScrollView
- MoveScaled(1,30,57,28)
+ MoveScaled(1,30,52,28)
}
}
Added: branches/iVL/FrmPkgsel2.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmPkgsel2.class Sat Jul 19 22:48:17 2008
@@ -0,0 +1,58 @@
+' 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()
+
+ WITH ME
+ .tlbanner.Text = "Select your indivirual packages to install.
<br>To install them all, just click next"
+ .tlbanner.Adjust
+ '.tlbanner.Border = Border.Plain
+ '.tlbanner.Width = MdlObjSizer.get_object_width(.tlbanner.Text)
+
+ END WITH
+ FMain.FrmCurr = ME
+ MdlPkgSel.LIST_PACKAGE_SELECTION()
+END
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .tlbanner.Width = .ClientWidth - 16
+ '.tlbanner.Move(.ClientX + 4, .clienty + 4, .ClientWidth - 18)
+ '.tlbanner.Move(4, 16, FrmPartSel.scrollPartitions.Width - 60)
+ .scrPkgs.Move(.tlbanner.Left, .tlbanner.top + (.tlbanner.Height *
2), .tlbanner.Width - 4, .ClientH - (.tlbanner.Height *
1.5)) ', .tlbanner.Width - 8, .ClientHeight - .tlbanner.height - 8)
+ '.scrPkgs.Resize(FrmPkgSel.scrlInstallOpts.Width, .ClientHeight - (.tlbanner.Height))
+' .VPanel1.Move(2, .tlbanner.Height * 2)
+ '.scrPkgs.Width = .tlbanner.Width
+ '.scrPkgs.Height = .ClientHeight - .tlbanner.Height - 4
+ END WITH
+
+END
+
+PUBLIC SUB Form_Show()
+ WITH ME
+ .tlbanner.Text = "Select your indivirual packages to install.
<br>To install them all, just click next"
+ .tlbanner.Adjust
+ '.tlbanner.Border = Border.Plain
+ '.tlbanner.Width = MdlObjSizer.get_object_width(.tlbanner.Text)
+
+ END WITH
+ FMain.FrmCurr = ME
+ MdlPkgSel.LIST_PACKAGE_SELECTION()
+
+
+END
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Sat Jul 19 22:48:17 2008
@@ -154,6 +154,7 @@
END IF
SHELL "umount /dev/" & sDrive WAIT
+ 'SHELL "umount " & sDrive WAIT
NEXT
ELSE ' only one drive found
@@ -174,7 +175,8 @@
END IF
- SHELL "umount /dev/" & clsglobal.sSourceMnt WAIT
+ 'SHELL "umount /dev/" & clsglobal.sSourceMnt WAIT
+ SHELL "umount " & ClsGlobal.sSourceMnt WAIT
|
14 messages has been excluded from this view by a project administrator.
