[xiph-commits] r11662 - in trunk/oggdsf: . bin build/NSIS/Release

illiminable at svn.xiph.org illiminable at svn.xiph.org
Tue Jun 27 13:08:02 PDT 2006 

Author: illiminable
Date: 2006-06-27 13:07:49 -0700 (Tue, 27 Jun 2006)
New Revision: 11662

Added:
   trunk/oggdsf/bin/xifish.ico
Removed:
   trunk/oggdsf/ABOUT.rtf
Modified:
   trunk/oggdsf/ABOUT.txt
   trunk/oggdsf/README
   trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi
Log:
* Update readme
* Update build script to set explorer icons
* Merge all 3 resolutions to one file and use that for the installer.

Deleted: trunk/oggdsf/ABOUT.rtf
===================================================================
(Binary files differ)

Modified: trunk/oggdsf/ABOUT.txt
===================================================================
--- trunk/oggdsf/ABOUT.txt	2006-06-27 19:20:03 UTC (rev 11661)
+++ trunk/oggdsf/ABOUT.txt	2006-06-27 20:07:49 UTC (rev 11662)
@@ -1,9 +1,10 @@
 http://www.illiminable.com/ogg/
 
-Version - 0.70.0827
 
 This is pre-release software, if you didn't download this from the site above, please visit it to ensure you have the latest version and are aware of the known issues with this software. Please check back regularly as this software is still under development.
 
+You can see which version this is in the VERSIONS file.
+
 Report new bugs and suggestions to ogg at illiminable.com
 
 More information about the various codecs can be found at www.xiph.org

Modified: trunk/oggdsf/README
===================================================================
--- trunk/oggdsf/README	2006-06-27 19:20:03 UTC (rev 11661)
+++ trunk/oggdsf/README	2006-06-27 20:07:49 UTC (rev 11662)
@@ -169,8 +169,12 @@
     projects which have wm5 configs (most of them)
     without installing this.
 
+ * Doxygen with DOT if you want to create the doc files
 
+ * NSIS (currently using 2.17) to build the installers
 
+
+
 You need all these things if you want to build this project.
  If you already do directx/multimedia development you may already
  have some or all of these sdk's. You only need them once to setup

Added: trunk/oggdsf/bin/xifish.ico
===================================================================
(Binary files differ)


Property changes on: trunk/oggdsf/bin/xifish.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi
===================================================================
--- trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi	2006-06-27 19:20:03 UTC (rev 11661)
+++ trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi	2006-06-27 20:07:49 UTC (rev 11662)
@@ -23,7 +23,7 @@
 !define PRODUCT_NAME "oggcodecs"
 
 ;	CHANGE EVERY VERSION
-!define PRODUCT_VERSION "0.72.1638"					
+!define PRODUCT_VERSION "0.72.1659"					
 
 !define PRODUCT_PUBLISHER "illiminable"
 !define PRODUCT_WEB_SITE "http://www.illiminable.com/ogg/"
@@ -188,7 +188,13 @@
   ; Unicows for old windows with no unicode - 1
   File "${VS_RUNTIME_LOCATION}\unicows.dll"
 
+  ; ico files - 1 (One file contains all these packed)
+  File "${OGGCODECS_ROOT_DIR}\bin\xifish.ico"
+  ;File "${OGGCODECS_ROOT_DIR}\bin\xifish-16.ico"
+  ;File "${OGGCODECS_ROOT_DIR}\bin\xifish-32.ico"
+  ;File "${OGGCODECS_ROOT_DIR}\bin\xifish-48.ico"
 
+
   ; Libraries - 11
   File "${OGGCODECS_ROOT_DIR}\src\lib\core\ogg\libOOOgg\${OGGCODECS_CONFIG_PATH}\libOOOgg.dll"
   File "${OGGCODECS_ROOT_DIR}\src\lib\core\ogg\libOOOggSeek\${OGGCODECS_CONFIG_PATH}\libOOOggSeek.dll"
@@ -314,32 +320,32 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\OGA" "" "Ogg File (oga)"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\OGA" "" "Ogg Audio File (oga)"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\OGA" "Extensions" ".oga"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\OGA" "MIME Types" "audio/x-ogg"
   
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\OGV" "" "Ogg File (ogv)"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\OGV" "" "Ogg Video File (ogv)"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\OGV" "Extensions" ".ogv"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\OGV" "MIME Types" "video/x-ogg"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\AXA" "" "Annodex File (axa)"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\AXA" "" "Annodex Audio File (axa)"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\AXA" "Extensions" ".axa"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\AXA" "MIME Types" "audio/x-annodex"
   
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\AXV" "" "Annodex File (axv)"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\AXV" "" "Annodex Video File (axv)"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\AXV" "Extensions" ".axv"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Video\AXV" "MIME Types" "video/x-annodex"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\SPX" "" "Ogg File (spx)"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\SPX" "" "Speex File (spx)"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\SPX" "Extensions" ".spx"
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Groups\Audio\SPX" "MIME Types" "audio/x-ogg"
   
@@ -420,7 +426,7 @@
 
 
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "AlreadyRegistered" "yes"
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "MediaType.Description" "Annodex File"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "MediaType.Description" "Annodex"
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "Permissions" 0x0000000f
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "Runtime" 0x00000007
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.anx" "Extension.MIME" "application/x-annodex"
@@ -429,7 +435,7 @@
 
 
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "AlreadyRegistered" "yes"
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "MediaType.Description" "Annodex File"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "MediaType.Description" "Annodex Audio"
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "Permissions" 0x0000000f
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "Runtime" 0x00000007
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axa" "PerceivedType" "audio"
@@ -439,7 +445,7 @@
 
 
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "AlreadyRegistered" "yes"
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "MediaType.Description" "Annodex File"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "MediaType.Description" "Annodex Video"
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "Permissions" 0x0000000f
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "Runtime" 0x00000007
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.axv" "PerceivedType" "video"
@@ -470,7 +476,7 @@
 
 
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "AlreadyRegistered" "yes"
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "MediaType.Description" "Ogg File"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "MediaType.Description" "Ogg"
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "Permissions" 0x0000000f
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "Runtime" 0x00000007
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.ogg" "Extension.MIME" "application/ogg"
@@ -489,7 +495,7 @@
 
 
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "AlreadyRegistered" "yes"
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "MediaType.Description" "Ogg Speex Audio"
+  WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "MediaType.Description" "Speex Audio"
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "Permissions" 0x0000000f
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "Runtime" 0x00000007
   WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\.spx" "PerceivedType" "audio"
@@ -631,24 +637,32 @@
   
   ; Handler key for ogg
   WriteRegStr HKCR "WMP.OggFile" "" "Ogg File"
+
+
   WriteRegStr HKCR "WMP.OggFile\shell" "" "open"
+
+
   WriteRegStr HKCR "WMP.OggFile\shell\open" "" "&Open"
   WriteRegStr HKCR "WMP.OggFile\shell\open\command" "" "$WMP_LOCATION /Open $\"%L$\""
   
   WriteRegStr HKCR "WMP.OggFile\shell\play" "" "&Play"
   WriteRegStr HKCR "WMP.OggFile\shell\play\command" "" "$WMP_LOCATION /Play $\"%L$\""    
+
+  WriteRegStr HKCR "WMP.OggFile\DefaultIcon" "" "$INSTDIR\xifish.ico"
   
   ; Handler key for oga
-  WriteRegStr HKCR "WMP.OgaFile" "" "Oga File"
+  WriteRegStr HKCR "WMP.OgaFile" "" "Ogg Audio File"
   WriteRegStr HKCR "WMP.OgaFile\shell" "" "open"
   WriteRegStr HKCR "WMP.OgaFile\shell\open" "" "&Open"
   WriteRegStr HKCR "WMP.OgaFile\shell\open\command" "" "$WMP_LOCATION /Open $\"%L$\""
   
   WriteRegStr HKCR "WMP.OgaFile\shell\play" "" "&Play"
   WriteRegStr HKCR "WMP.OgaFile\shell\play\command" "" "$WMP_LOCATION /Play $\"%L$\""    
+
+  WriteRegStr HKCR "WMP.OgaFile\DefaultIcon" "" "$INSTDIR\xifish.ico"
   
   ; Handler key for ogv
-  WriteRegStr HKCR "WMP.OgvFile" "" "Ogv File"
+  WriteRegStr HKCR "WMP.OgvFile" "" "Ogg Video File"
   WriteRegStr HKCR "WMP.OgvFile\shell" "" "open"
   WriteRegStr HKCR "WMP.OgvFile\shell\open" "" "&Open"
   WriteRegStr HKCR "WMP.OgvFile\shell\open\command" "" "$WMP_LOCATION /Open $\"%L$\""
@@ -656,6 +670,8 @@
   WriteRegStr HKCR "WMP.OgvFile\shell\play" "" "&Play"
   WriteRegStr HKCR "WMP.OgvFile\shell\play\command" "" "$WMP_LOCATION /Play $\"%L$\""    
    
+  WriteRegStr HKCR "WMP.OgvFile\DefaultIcon" "" "$INSTDIR\xifish.ico"
+
   goto done_wmp
   
 fail_wmp:
@@ -676,7 +692,7 @@
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_CORE} $(DESC_OggCoreSection)
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OGG_AUDIO_DEFAULT} $(DESC_OggExtensionAudioByDefault)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_USE_WMP_FOR_OGG} ${DESC_OggOpensInWMP}
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_USE_WMP_FOR_OGG} $(DESC_OggOpensInWMP)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
@@ -915,6 +931,13 @@
   ; Delete unicows - 1
   Delete "$INSTDIR\unicows.dll"
 
+  ; Delete icons - 3
+  Delete "$INSTDIR\xifish.ico"
+  ;Delete "$INSTDIR\xifish-16.ico"
+  ;Delete "$INSTDIR\xifish-32.ico"
+  ;Delete "$INSTDIR\xifish-48.ico"
+
+
   ;Delete accesory files, links etc.
   Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"

More information about the commits mailing list