summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-10-09 01:24:18 +0000
committerNorbert Preining <preining@logic.at>2008-10-09 01:24:18 +0000
commit9233dcb0c3a6dc6b22ff63658c2555a161fed8fb (patch)
treede0229eced92ca567d8b96027b12a887e280e3bb
parent1b93a8074d5c6733926884ad77e8d0de3a5d177c (diff)
update nsis installer script for inclusion of correct tlpobj
git-svn-id: svn://tug.org/texlive/trunk@10895 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/etc/nsis/texlive-installer.nsi4
-rw-r--r--Master/tlpkg/etc/nsis/updater.nsi19
2 files changed, 4 insertions, 19 deletions
diff --git a/Master/tlpkg/etc/nsis/texlive-installer.nsi b/Master/tlpkg/etc/nsis/texlive-installer.nsi
index 923245fb9e1..d84d87dca30 100644
--- a/Master/tlpkg/etc/nsis/texlive-installer.nsi
+++ b/Master/tlpkg/etc/nsis/texlive-installer.nsi
@@ -33,4 +33,8 @@ FunctionEnd
Section "MainGroup"
SetOutPath "$INSTDIR"
File /r tlupdates\*.*
+ ExecWait '"$INSTDIR\bin\win32\tlmgr.bat" _include_tlpobj "$INSTDIR\tlpkg\tlpobj\bin-texlive.tlpobj"'
+ ExecWait '"$INSTDIR\bin\win32\tlmgr.bat" _include_tlpobj "$INSTDIR\tlpkg\tlpobj\texlive.infra.tlpobj"'
+ ExecWait '"$INSTDIR\bin\win32\tlmgr.bat" _include_tlpobj "$INSTDIR\tlpkg\tlpobj\texlive.infra.doc.tlpobj"'
+ ExecWait '"$INSTDIR\bin\win32\tlmgr.bat" _include_tlpobj "$INSTDIR\tlpkg\tlpobj\texlive.infra.win32.tlpobj"'
SectionEnd
diff --git a/Master/tlpkg/etc/nsis/updater.nsi b/Master/tlpkg/etc/nsis/updater.nsi
deleted file mode 100644
index 16efa8f381c..00000000000
--- a/Master/tlpkg/etc/nsis/updater.nsi
+++ /dev/null
@@ -1,19 +0,0 @@
-# set the name of the installer
-outfile "hello world.exe"
-
-Function .onInit
- MessageBox MB_YESNO "This will update your TeX Live installation. Do you wish to continue?" IDYES gogogo
- Abort
- gogogo:
-FunctionEnd
-
-
-# create a default section.
-section
-
-# create a popup box, with an OK button and the text "Hello world!"
-messageBox MB_OK "Hello world!"
-
-#untgz::extract "-d" "$INSTDIR\temp" "$TEMP\${DICT_FILENAME}"
-
-sectionEnd