'[NSIS-commits] SF.net SVN: nsis:[6453] NSIS/trunk'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       nsis-commits
Subject:    [NSIS-commits] SF.net SVN: nsis:[6453] NSIS/trunk
From:       anders_k () users ! sourceforge ! net
Date:       2014-03-28 16:21:42
Message-ID: E1WTZXN-0001F2-Ta () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 6453
          http://sourceforge.net/p/nsis/code/6453
Author:   anders_k
Date:     2014-03-28 16:21:39 +0000 (Fri, 28 Mar 2014)
Log Message:
-----------
CreateShortCut > CreateShortcut

Modified Paths:
--------------
    NSIS/trunk/Contrib/StartMenu/Example.nsi
    NSIS/trunk/Docs/src/generalpurpose.but
    NSIS/trunk/Docs/src/script.but
    NSIS/trunk/Docs/src/var.but
    NSIS/trunk/Examples/Modern UI/StartMenu.nsi
    NSIS/trunk/Examples/bigtest.nsi
    NSIS/trunk/Examples/example2.nsi
    NSIS/trunk/Examples/makensis.nsi
    NSIS/trunk/SCons/config.py
    NSIS/trunk/Source/exehead/exec.c
    NSIS/trunk/Source/exehead/fileform.h
    NSIS/trunk/Source/script.cpp
    NSIS/trunk/Source/tokens.cpp

Modified: NSIS/trunk/Contrib/StartMenu/Example.nsi
===================================================================
--- NSIS/trunk/Contrib/StartMenu/Example.nsi	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Contrib/StartMenu/Example.nsi	2014-03-28 16:21:39 UTC (rev 6453)
@@ -40,11 +40,11 @@
 	StrCmp $R1 ">" skip
 
 		CreateDirectory $SMPROGRAMS\$R0
-		CreateShortCut $SMPROGRAMS\$R0\MakeNSISw.lnk $INSTDIR\makensisw.exe
+		CreateShortcut $SMPROGRAMS\$R0\MakeNSISw.lnk $INSTDIR\makensisw.exe
 
 		SetShellVarContext All
 		CreateDirectory $SMPROGRAMS\$R0
-		CreateShortCut "$SMPROGRAMS\$R0\All users MakeNSISw.lnk" $INSTDIR\makensisw.exe
+		CreateShortcut "$SMPROGRAMS\$R0\All users MakeNSISw.lnk" $INSTDIR\makensisw.exe
 
 	skip:
 SectionEnd
\ No newline at end of file

Modified: NSIS/trunk/Docs/src/generalpurpose.but
===================================================================
--- NSIS/trunk/Docs/src/generalpurpose.but	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Docs/src/generalpurpose.but	2014-03-28 16:21:39 UTC (rev 6453)
@@ -33,7 +33,7 @@
 
 \c CreateDirectory $INSTDIR\some\directory
 
-\S2{createshortcut} CreateShortCut
+\S2{createshortcut} CreateShortcut
 
 \c [/NoWorkingDir] link.lnk target.file [parameters [icon.file [icon_index_number \
[start_options [keyboard_shortcut [description]]]]]]  
@@ -45,7 +45,7 @@
 The error flag is set if the shortcut cannot be created (i.e. either of the paths \
(link or target) does not exist, or some other error).  
 \c CreateDirectory "$SMPROGRAMS\My Company"
-\c CreateShortCut "$SMPROGRAMS\My Company\My Program.lnk" "$INSTDIR\My Program.exe" \
\ +\c CreateShortcut "$SMPROGRAMS\My Company\My Program.lnk" "$INSTDIR\My \
Program.exe" \  \c   "some command line parameters" "$INSTDIR\My Program.exe" 2 \
SW_SHOWNORMAL \  \c   ALT|CONTROL|SHIFT|F5 "a description"
 

Modified: NSIS/trunk/Docs/src/script.but
===================================================================
--- NSIS/trunk/Docs/src/script.but	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Docs/src/script.but	2014-03-28 16:21:39 UTC (rev 6453)
@@ -78,7 +78,7 @@
 
 To extend a command over multiple lines, use a backslash (\\) at the end of the \
line. The next line will effectively be concatenated to the end of it. For example:  
-\c CreateShortCut "$SMPROGRAMS\NSIS\ZIP2EXE project workspace.lnk" \
+\c CreateShortcut "$SMPROGRAMS\NSIS\ZIP2EXE project workspace.lnk" \
 \c     "$INSTDIR\source\zip2exe\zip2exe.dsw"
 \c
 \c MessageBox MB_YESNO|MB_ICONQUESTION \

Modified: NSIS/trunk/Docs/src/var.but
===================================================================
--- NSIS/trunk/Docs/src/var.but	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Docs/src/var.but	2014-03-28 16:21:39 UTC (rev 6453)
@@ -103,7 +103,7 @@
 
 \e{$STARTMENU}
 
-The start menu folder (useful in adding start menu items using \
\R{createshortcut}{CreateShortCut}). The context of this constant (All Users or \
Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} setting. The \
default is the current user. +The start menu folder (useful in adding start menu \
items using \R{createshortcut}{CreateShortcut}). The context of this constant (All \
Users or Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} \
setting. The default is the current user.  
 \e{$SMPROGRAMS}
 

Modified: NSIS/trunk/Examples/Modern UI/StartMenu.nsi
===================================================================
--- NSIS/trunk/Examples/Modern UI/StartMenu.nsi	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Examples/Modern UI/StartMenu.nsi	2014-03-28 16:21:39 UTC (rev 6453)
@@ -76,7 +76,7 @@
     
     ;Create shortcuts
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" \
"$INSTDIR\Uninstall.exe" +    CreateShortcut \
"$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"  
   !insertmacro MUI_STARTMENU_WRITE_END
 

Modified: NSIS/trunk/Examples/bigtest.nsi
===================================================================
--- NSIS/trunk/Examples/bigtest.nsi	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Examples/bigtest.nsi	2014-03-28 16:21:39 UTC (rev 6453)
@@ -138,7 +138,7 @@
   
 SectionEnd
 
-Section "Test CreateShortCut"
+Section "Test CreateShortcut"
 
   SectionIn 1 2 3
 
@@ -238,10 +238,10 @@
   
   CreateDirectory "$SMPROGRAMS\Big NSIS Test"
   SetOutPath $INSTDIR ; for working directory
-  CreateShortCut "$SMPROGRAMS\Big NSIS Test\Uninstall BIG NSIS Test.lnk" \
"$INSTDIR\bt-uninst.exe" ; use defaults for parameters, icon, etc. +  CreateShortcut \
"$SMPROGRAMS\Big NSIS Test\Uninstall BIG NSIS Test.lnk" "$INSTDIR\bt-uninst.exe" ; \
use defaults for parameters, icon, etc.  ; this one will use notepad's icon, start it \
                minimized, and give it a hotkey (of Ctrl+Shift+Q)
-  CreateShortCut "$SMPROGRAMS\Big NSIS Test\silent.nsi.lnk" "$INSTDIR\silent.nsi" "" \
                "$WINDIR\notepad.exe" 0 SW_SHOWMINIMIZED CONTROL|SHIFT|Q
-  CreateShortCut "$SMPROGRAMS\Big NSIS Test\TheDir.lnk" "$INSTDIR\" "" "" 0 \
SW_SHOWMAXIMIZED CONTROL|SHIFT|Z +  CreateShortcut "$SMPROGRAMS\Big NSIS \
Test\silent.nsi.lnk" "$INSTDIR\silent.nsi" "" "$WINDIR\notepad.exe" 0 \
SW_SHOWMINIMIZED CONTROL|SHIFT|Q +  CreateShortcut "$SMPROGRAMS\Big NSIS \
Test\TheDir.lnk" "$INSTDIR\" "" "" 0 SW_SHOWMAXIMIZED CONTROL|SHIFT|Z  
 FunctionEnd
 

Modified: NSIS/trunk/Examples/example2.nsi
===================================================================
--- NSIS/trunk/Examples/example2.nsi	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Examples/example2.nsi	2014-03-28 16:21:39 UTC (rev 6453)
@@ -63,8 +63,8 @@
 Section "Start Menu Shortcuts"
 
   CreateDirectory "$SMPROGRAMS\Example2"
-  CreateShortCut "$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" \
                "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\Example2\Example2 (MakeNSISW).lnk" \
"$INSTDIR\example2.nsi" "" "$INSTDIR\example2.nsi" 0 +  CreateShortcut \
"$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" \
"$INSTDIR\uninstall.exe" 0 +  CreateShortcut "$SMPROGRAMS\Example2\Example2 \
(MakeNSISW).lnk" "$INSTDIR\example2.nsi" "" "$INSTDIR\example2.nsi" 0  
 SectionEnd
 

Modified: NSIS/trunk/Examples/makensis.nsi
===================================================================
--- NSIS/trunk/Examples/makensis.nsi	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Examples/makensis.nsi	2014-03-28 16:21:39 UTC (rev 6453)
@@ -347,10 +347,10 @@
   SectionIn 1 2
   SetOutPath $INSTDIR
 !ifndef NO_STARTMENUSHORTCUTS
-  CreateShortCut "$SMPROGRAMS\NSIS${NAMESUFFIX}.lnk" "$INSTDIR\NSIS.exe"
+  CreateShortcut "$SMPROGRAMS\NSIS${NAMESUFFIX}.lnk" "$INSTDIR\NSIS.exe"
 !endif
 
-  CreateShortCut "$DESKTOP\NSIS${NAMESUFFIX}.lnk" "$INSTDIR\NSIS.exe"
+  CreateShortcut "$DESKTOP\NSIS${NAMESUFFIX}.lnk" "$INSTDIR\NSIS.exe"
 
 ${MementoSectionEnd}
 

Modified: NSIS/trunk/SCons/config.py
===================================================================
--- NSIS/trunk/SCons/config.py	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/SCons/config.py	2014-03-28 16:21:39 UTC (rev 6453)
@@ -242,7 +242,7 @@
 cfg.Add(
   BoolVariable(
     'NSIS_SUPPORT_CREATESHORTCUT',
-    'enables support for CreateShortCut.',
+    'enables support for CreateShortcut.',
     'yes'
   )
 )

Modified: NSIS/trunk/Source/exehead/exec.c
===================================================================
--- NSIS/trunk/Source/exehead/exec.c	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Source/exehead/exec.c	2014-03-28 16:21:39 UTC (rev 6453)
@@ -1056,7 +1056,7 @@
       if (!validpathspec(buf2))
         GetStringFromParm(0x21);
 
-      log_printf8(_T("CreateShortCut: out: \"%s\", in: \"%s %s\", icon: %s,%d, \
sw=%d, hk=%d"), +      log_printf8(_T("CreateShortcut: out: \"%s\", in: \"%s %s\", \
icon: %s,%d, sw=%d, hk=%d"),  \
buf1,buf2,buf0,buf3,parm4&0xff,(parm4&0xff00)>>8,parm4>>16);  
       hres = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,

Modified: NSIS/trunk/Source/exehead/fileform.h
===================================================================
--- NSIS/trunk/Source/exehead/fileform.h	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Source/exehead/fileform.h	2014-03-28 16:21:39 UTC (rev 6453)
@@ -138,7 +138,7 @@
 #endif
 
 #ifdef NSIS_SUPPORT_CREATESHORTCUT
-  EW_CREATESHORTCUT,    // Make Shortcut: 5, [link file, target file, parameters, \
icon file, iconindex|show mode<<8|hotkey<<16] +  EW_CREATESHORTCUT,    // Make \
Shortcut: 5, [link file, target file, parameters, icon file, iconindex|show \
mode<<8|hotkey<<16|noworkingdir]  #endif
 
 #ifdef NSIS_SUPPORT_COPYFILES

Modified: NSIS/trunk/Source/script.cpp
===================================================================
--- NSIS/trunk/Source/script.cpp	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Source/script.cpp	2014-03-28 16:21:39 UTC (rev 6453)
@@ -4395,7 +4395,7 @@
       {
         if (line.getnumtokens() > 5 && *line.gettoken_str(5))
         {
-          ERROR_MSG(_T("CreateShortCut: cannot interpret icon index\n"));
+          ERROR_MSG(_T("CreateShortcut: cannot interpret icon index\n"));
           PRINTHELP()
         }
         ent.offsets[4]=0;
@@ -4407,7 +4407,7 @@
         int a=line.gettoken_enum(6,_T("SW_SHOWNORMAL\0SW_SHOWMAXIMIZED\0SW_SHOWMINIMIZED\0"));
  if (a < 0)
         {
-          ERROR_MSG(_T("CreateShortCut: unknown show mode \"%") NPRIs \
_T("\"\n"),line.gettoken_str(6)); +          ERROR_MSG(_T("CreateShortcut: unknown \
show mode \"%") NPRIs _T("\"\n"),line.gettoken_str(6));  PRINTHELP()
         }
         ent.offsets[4] |= tab[a]<<8;
@@ -4437,7 +4437,7 @@
             c=VK_F1-1+_ttoi(s+1);
             if (_ttoi(s+1) < 1 || _ttoi(s+1) > 24)
             {
-              warning_fl(_T("CreateShortCut: F-key \"%") NPRIs _T("\" out of \
range"),s); +              warning_fl(_T("CreateShortcut: F-key \"%") NPRIs _T("\" \
out of range"),s);  }
           }
           else if (((s[0] >= _T('A') && s[0] <= _T('Z')) || (s[0] >= _T('0') && s[0] \
<= _T('9'))) && !s[1]) @@ -4445,12 +4445,12 @@
           else
           {
             c=s[0];
-            warning_fl(_T("CreateShortCut: unrecognized hotkey \"%") NPRIs \
_T("\""),s); +            warning_fl(_T("CreateShortcut: unrecognized hotkey \"%") \
NPRIs _T("\""),s);  }
           ent.offsets[4] |= (c) << 16;
         }
       }
-      SCRIPT_MSG(_T("CreateShortCut: \"%") NPRIs _T("\"->\"%") NPRIs _T("\" %") \
NPRIs _T(" icon:%") NPRIs _T(",%d, showmode=0x%X, hotkey=0x%X, comment=%") NPRIs \
_T("\n"), +      SCRIPT_MSG(_T("CreateShortcut: \"%") NPRIs _T("\"->\"%") NPRIs \
_T("\" %") NPRIs _T(" icon:%") NPRIs _T(",%d, showmode=0x%X, hotkey=0x%X, comment=%") \
NPRIs _T("\n"),  line.gettoken_str(1),line.gettoken_str(2),line.gettoken_str(3),
         line.gettoken_str(4),ent.offsets[4]&0xff,(ent.offsets[4]>>8)&0xff,ent.offsets[4]>>16,line.gettoken_str(8));
  

Modified: NSIS/trunk/Source/tokens.cpp
===================================================================
--- NSIS/trunk/Source/tokens.cpp	2014-03-28 16:17:07 UTC (rev 6452)
+++ NSIS/trunk/Source/tokens.cpp	2014-03-28 16:21:39 UTC (rev 6453)
@@ -58,7 +58,7 @@
 {TOK_CRCCHECK,_T("CRCCheck"),1,0,_T("(on|force|off)"),TP_GLOBAL},
 {TOK_CREATEDIR,_T("CreateDirectory"),1,0,_T("directory_name"),TP_CODE},
 {TOK_CREATEFONT,_T("CreateFont"),2,5,_T("$(user_var: handle output) face_name \
                [height weight /ITALIC /UNDERLINE /STRIKE]"),TP_CODE},
-{TOK_CREATESHORTCUT,_T("CreateShortCut"),2,6,_T("[/NoWorkingDir] shortcut_name.lnk \
shortcut_target [parameters [icon_file [icon index [showmode [hotkey [comment]]]]]]\n \
showmode=(SW_SHOWNORMAL|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED)\n    \
hotkey=(ALT|CONTROL|EXT|SHIFT)|(F1-F24|A-Z)"),TP_CODE}, \
+{TOK_CREATESHORTCUT,_T("CreateShortcut"),2,6,_T("[/NoWorkingDir] shortcut_name.lnk \
shortcut_target [parameters [icon_file [icon index [showmode [hotkey [comment]]]]]]\n \
showmode=(SW_SHOWNORMAL|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED)\n    \
hotkey=(ALT|CONTROL|EXT|SHIFT)|(F1-F24|A-Z)"),TP_CODE},  \
{TOK_DBOPTIMIZE,_T("SetDatablockOptimize"),1,0,_T("(off|on)"),TP_ALL},  \
{TOK_DELETEINISEC,_T("DeleteINISec"),2,0,_T("ini_file section_name"),TP_CODE},  \
{TOK_DELETEINISTR,_T("DeleteINIStr"),3,0,_T("ini_file section_name \
entry_name"),TP_CODE},

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
NSIS-commits mailing list
NSIS-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nsis-commits


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic