From fe5e1301f629f4e9b8edef39b1d688d2fa89c763 Mon Sep 17 00:00:00 2001
From: Simon Clitherow <aphex@nildram.co.uk>
Date: Wed, 28 Jul 2004 16:19:50 +0000
Subject: [PATCH] - update for the win installer scripts ( added new scripts,
 etc ).

---
 release/windows/installer/00.blender.nsi      |  29 ++++++++++--------
 release/windows/installer/00.sconsblender.nsi |  18 +++--------
 release/windows/installer/01.installer.bmp    | Bin 32280 -> 0 bytes
 release/windows/installer/data.ini            |   2 +-
 4 files changed, 21 insertions(+), 28 deletions(-)
 delete mode 100644 release/windows/installer/01.installer.bmp

diff --git a/release/windows/installer/00.blender.nsi b/release/windows/installer/00.blender.nsi
index c1b8a4fa736..7c2a8ff8867 100644
--- a/release/windows/installer/00.blender.nsi
+++ b/release/windows/installer/00.blender.nsi
@@ -176,6 +176,9 @@ Var is2KXP
 Function DataLocation
   !insertmacro MUI_HEADER_TEXT "$(TEXT_IO_TITLE)" ""
   
+  ; Set default choice
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "data.ini" "Field 3" "State" 1
+  
   StrCpy $R1 $winversion 2
   StrCmp $R1 "NT" do_win2kxp
   StrCmp $winversion "2000" do_win2kxp
@@ -184,15 +187,12 @@ Function DataLocation
   
   ;else...
   Strcpy $is2KXP "false"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "data.ini" "Field 3" "State" 1
 
   Goto continue
 
   do_win2kXP:
     Strcpy $is2KXP "true"
     
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "data.ini" "Field 2" "State" 1
-    
   continue: 
   
   !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "data.ini"
@@ -224,15 +224,6 @@ Function DataLocation
     ReadEnvStr $BLENDERHOME "HOME"
     Goto end
   do_inst_path:
-    Strcmp $is2KXP "true" warning
-    Call SetWin9xPath
-    Goto end
-  warning:
-    IfFileExists "$PROFILE\Application Data\Blender Foundation\Blender\.blender\.bfont.ttf" disp_warning
-    Call SetWin9xPath
-    Goto end
-  disp_warning:
-    MessageBox MB_OK "Please note that user data files have been found in $PROFILE\Application Data\Blender Foundation\Blender. Blender will automatically use these instead of the files in $INSTDIR. Please remove the .blender folder from Application Data if you wish to use this option."
     Call SetWin9xPath
   end:
   
@@ -263,18 +254,27 @@ Section "Blender-VERSION (required)" SecCopyUI
   SetOutPath $BLENDERHOME\.blender\scripts
   File DISTDIR\.blender\scripts\ac3d_export.py
   File DISTDIR\.blender\scripts\ac3d_import.py
+  File DISTDIR\.blender\scripts\Apply_def.py
+  File DISTDIR\.blender\scripts\batch_name_edit.py
+  File DISTDIR\.blender\scripts\bevel_center.py
   File DISTDIR\.blender\scripts\blender2cal3d.py
   File DISTDIR\.blender\scripts\bvh_export.py
   File DISTDIR\.blender\scripts\bvh_import.py
+  File DISTDIR\.blender\scripts\DirectX8Exporter.py
   File DISTDIR\.blender\scripts\DirectXExporter.py
-  File DISTDIR\.blender\scripts\disp_paint233f.py
+  File DISTDIR\.blender\scripts\disp_paint.py
+  File DISTDIR\.blender\scripts\doc_browser.py
   File DISTDIR\.blender\scripts\fixfromarmature.py
+  File DISTDIR\.blender\scripts\hotkeys.py
+  File DISTDIR\.blender\scripts\kloputils.py
+  File DISTDIR\.blender\scripts\knife.py
   File DISTDIR\.blender\scripts\lightwave_export.py
   File DISTDIR\.blender\scripts\lightwave_import.py
   File DISTDIR\.blender\scripts\mod_blender.py
   File DISTDIR\.blender\scripts\mod_meshtools.py
   File DISTDIR\.blender\scripts\nendo_export.py
   File DISTDIR\.blender\scripts\nendo_import.py
+  File DISTDIR\.blender\scripts\obdatacopier.py
   File DISTDIR\.blender\scripts\obj_export.py
   File DISTDIR\.blender\scripts\obj_import.py
   File DISTDIR\.blender\scripts\off_export.py
@@ -283,7 +283,9 @@ Section "Blender-VERSION (required)" SecCopyUI
   File DISTDIR\.blender\scripts\radiosity_import.py
   File DISTDIR\.blender\scripts\raw_export.py
   File DISTDIR\.blender\scripts\raw_import.py
+  File DISTDIR\.blender\scripts\renameobjectbyblock.py
   File DISTDIR\.blender\scripts\rvk1_torvk2.py
+  File DISTDIR\.blender\scripts\sel_same.py
   File DISTDIR\.blender\scripts\slp_import.py
   File DISTDIR\.blender\scripts\sysinfo.py
   File DISTDIR\.blender\scripts\truespace_export.py
@@ -297,6 +299,7 @@ Section "Blender-VERSION (required)" SecCopyUI
   File DISTDIR\.blender\scripts\wrl2export.py
   SetOutPath $BLENDERHOME\.blender\bpydata
   File DISTDIR\.blender\bpydata\readme.txt
+  File DISTDIR\.blender\bpydata\KUlang.txt
   
   ; Additional Languages files
   SetOutPath $BLENDERHOME\.blender
diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index f96cbd771af..bb7e2975547 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -175,6 +175,9 @@ Var is2KXP
 
 Function DataLocation
   !insertmacro MUI_HEADER_TEXT "$(TEXT_IO_TITLE)" ""
+
+  ; Set default choice
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "data.ini" "Field 3" "State" 1
   
   StrCpy $R1 $winversion 2
   StrCmp $R1 "NT" do_win2kxp
@@ -184,15 +187,12 @@ Function DataLocation
   
   ;else...
   Strcpy $is2KXP "false"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "data.ini" "Field 3" "State" 1
 
   Goto continue
 
   do_win2kXP:
     Strcpy $is2KXP "true"
     
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "data.ini" "Field 2" "State" 1
-    
   continue: 
   
   !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "data.ini"
@@ -224,15 +224,6 @@ Function DataLocation
     ReadEnvStr $BLENDERHOME "HOME"
     Goto end
   do_inst_path:
-    Strcmp $is2KXP "true" warning
-    Call SetWin9xPath
-    Goto end
-  warning:
-    IfFileExists "$PROFILE\Application Data\Blender Foundation\Blender\.blender\.bfont.ttf" disp_warning
-    Call SetWin9xPath
-    Goto end
-  disp_warning:
-    MessageBox MB_OK "Please note that user data files have been found in $PROFILE\Application Data\Blender Foundation\Blender. Blender will automatically use these instead of the files in $INSTDIR. Please remove the .blender folder from Application Data if you wish to use this option."
     Call SetWin9xPath
   end:
   
@@ -256,8 +247,7 @@ Section "Blender-VERSION (required)" SecCopyUI
   SetOutPath $BLENDERHOME\.blender\bpydata
   File DISTDIR\.blender\bpydata\readme.txt
   
-  SetOutPath $BLENDERHOME\.blender\locale\ca\LC_MESSAGES
-  ;File DISTDIR\.blender\locale\ca\LC_MESSAGES\blender.mo
+  ; Language files
   [LANGUAGECONTS]
   
   SetOutPath $INSTDIR
diff --git a/release/windows/installer/01.installer.bmp b/release/windows/installer/01.installer.bmp
deleted file mode 100644
index 61c2becbebd5651e11307c467cbf55d485bf2abf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32280
zcmeI0+fP(i6o>J-{{V@CjYjK>@vRXXi=}}Cv5mJB)1*y&Xo9BU76XWi!o(urWdwp+
zFbWC-a`#4WS{3hAK~a#3cxk<rT5pJg+V-2Xob6$TsoM4hTtDD&=A3=@p8fsST6@og
zebiMDVCh|s<M`Xk-=tvy0mA|Ut?TZ?l(*#1bKx(Q5>Nt4KnW-TC7=Y9fD%vwN<axH
z0VSXWlz<XY0!ly$C;=s)1eAahPy$Lo2`B+2pahhF5>Nt4KnW-TC7=Y9fD%vwN<axH
z0VSXWlz<XY0!ly$C;=s)1eAahPy$Lo2`B+2pahhF5>Nt4KnW-TC7=Y9fD%vwN<axH
z0VSXWlz<XY0!ly$C;=s)1eAahPy$Lo2`B*@fj?hCw&r>|_z3uO_?buk8kp<;=4=}L
z?<f97)awHhu=Dr0`WpZ3kN=DF*BGgPQ{S-$oSj}20tT0z;!}^F_?M^2Q~QJe{oHi>
z(i7jY%v?B8e+>b_V#g(H`}+E@x7VY`{^e=X%OmoXocx1F(m;;BL1e$nx#{2EiM<~g
z)IJ?KmuZ?=zkw$Zuwwxf<OQ#I`{>c5o}QkE4<B}0deC2Tk-M}J(cXVhy!;N2`^wX|
z`#)oO$#+~rf+<J{F(dl~-&n`(MvKc(5<i40#@@ew|K7cOckbNz!_w{kl8fBEd-pEQ
z5baU_h<M2>dBpc99m<jZ5d$F^)IKz~<Z&5^VBr1BM2zpo^f%3JnXd%AxGd!wK2Q>i
zg=$w<*R5N(Zr;3k<Hn8a*RNl@cI{W2c*%9{(gyuziAR37BynN4hI6?n4QS~l>A`-K
zp5@3uh!KtCiVRIxbjuLDb0UOUP<EIOg@SoWrW?nZyFlPLgzLGl(UQ(~mw^UA%*EI%
zSFT*Tbm_#26BjOA__@Eh($Udz@#4kK&Q97~zI^%W)vLc)G7&*M*k!IuGmbpsB}Np{
zA);r*5DbJEk#S{c8C@Fi2)!{Dk-(c5-${96I*v0_qT1K-A!)bWXjz&eK;)AGltGe$
z>;M#w02#1&+uGW?bm`LI;NX!XM^2kIEj2Z@wzd}QPo6y4)YQ~$>CBlkEiEnQ&Yh!i
zTU%Rudwc(&@P2jP5-kyr*hMEsXD!h){hvO4nxPm`bn4V8IpHF=WORCCB;Gde<2$ix
zOqWb2o{i&7Un-k0;W(5W_h&Sb4+@N?c#;<+2>Ajx03JVne8!9!W5$eGxpHMuVUfd;
zF>BWBv17+#ePm>0Qc{x3<!WqfJap*L;lqcI963V!pDal*;D}v>2jZ5rp)oqvUq>y`
z6{1f>=LZiSJYZ@6{{8#*?fcOq&bfkUKzn+lbKECdh&N_I#1gk;Ix)-y?T%ym5YBPD
zHfuENmt-_XQ|MSmC7sC#DB&_5)z{Zgm@r}D#EBUW2PEt3>Pm`B%3b9Z6&35&txHQw
zn?8N|=+UFe_lSsy#Kgpsl9C@R?b)+u@7}!_f){pih3ni!H2mJucOHFf(>ES9G&Jnq
zy?e)w9Tbyo+qRXKmNLp_kBW<ndAViFma?+4s;a8(+qcsPqYxp4lbBAXQ~y~eNOOYO
zIL;Q%<hZHoLnFt%l3LbiN;jd7(QI-kdQ?Bs8AK!qZVn$leAdjFSy@>aM17+NcDO9d
z$BrJWtE+>v%T-oUUQtj`uxQbusHmt>qecY>1><{MT-=5Y8weEye-Y<Ag=IB0HPzMC
zSW{V9iG4)QfGRI9$3d(tDk@@#)vH%8U%q_Fk|oK>$<z}gUZ$j^u(G75r|0D4(2_^!
zpI{Nw$#j+g=EdxM9ha(3<Qu!qwr!A>^Z|_~uw{)l8O<t+(bUxV`1ruUz?hgAr*kbe
z6jn@}o$Irw{5%5-pToN!bVHAPudB6uFLSxdU3qzVxG;6<)VD2#g@w(ZKi}zel6qJ`
zc#x5sEN$Glv9Pf4Yd>1Qetmv^{;E~091cfHYT6gcYi6d_eVEbuUgqrqe!sf?!Lsuo
zCs%)-kQ1AbMBrs+W@0);fG{IaCC!-y6C}rpYGRws8#{Ig44B~J_+Ydfucdl(^s3%W
zndOXijao<PX5quBaqo;HU+}@56z-jo<+a;oG1~o=%M<t474oH4AD^z-k+ZPY*3{xA
z`N%q+mz$TEkQfmjL6JwHp`ml<&L#V>9+9W)0mwuzWoKuvSh0d;Nhu3ITaXvEupu;~
zV^UUkNOsSw{J!t#j9mEbrwPuugas4<1|rN@0$4S0oarz}7Acl0)^UQIn#K}FeKQ};
z26ckllbVT$*YXLAz-9?!)<ip-;hj5ojvqgM^5n_s85yNpOPiaTA!BW^TZnLXHp>q#
z_dWl5jkTcnvHKesSXt_UUi<m>1C5Oo(oLH-(~qmHY^`%Gg*`kxe8h+m_#P4x5*;1Q
z63?QKBSwoCFDAxfV`D#w%bk+e{KDL<S2FrV`|O_3Wv#R0^S_LZXNcU~TylKZu3b{q
z*^01v<5L^EP}#P@fqjd8mu^x6dV?sty}Xu{nt7Q5PEBLWN>L383Yrr=hXTmTip%J%
z=g55dT<T6|%jRB5Xgs#`+-5qZAbP$~?e2a+Ahou&vUjektlI4MeQRl1sdJ5UUd%ko
F``^cF`X2xQ

diff --git a/release/windows/installer/data.ini b/release/windows/installer/data.ini
index 1c19d987ade..d29efcc3fc9 100644
--- a/release/windows/installer/data.ini
+++ b/release/windows/installer/data.ini
@@ -11,7 +11,7 @@ Bottom=10
 
 [Field 2]
 Type=RadioButton
-Text=Use Application Data Directory (Recommended on Win2k/XP)
+Text=Use Application Data Directory (Win2k/XP only)
 Left=0
 Right=-1
 Top=20