Menu
▾
▴
opengtoolkit-svn — OpenG Toolkit SVN commits mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(7) |
Feb
(2) |
Mar
(32) |
Apr
(25) |
May
(11) |
Jun
(25) |
Jul
(5) |
Aug
(8) |
Sep
|
Oct
(8) |
Nov
(13) |
Dec
(17) |
| 2009 |
Jan
(34) |
Feb
(18) |
Mar
(4) |
Apr
|
May
(9) |
Jun
(1) |
Jul
(9) |
Aug
|
Sep
(12) |
Oct
|
Nov
(9) |
Dec
(1) |
| 2010 |
Jan
(1) |
Feb
(14) |
Mar
|
Apr
|
May
(4) |
Jun
(14) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
(225) |
| 2011 |
Jan
(17) |
Feb
|
Mar
|
Apr
(27) |
May
(24) |
Jun
(1) |
Jul
(3) |
Aug
(22) |
Sep
(24) |
Oct
(22) |
Nov
(6) |
Dec
(4) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
(1) |
Mar
|
Apr
(8) |
May
(21) |
Jun
|
Jul
(2) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(27) |
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
(7) |
Sep
(16) |
Oct
(3) |
Nov
|
Dec
|
|
From: <lab...@us...> - 2014-05-23 21:25:08
|
Revision: 1495
http://sourceforge.net/p/opengtoolkit/svn/1495
Author: labviewer
Date: 2014-05-23 21:25:05 +0000 (Fri, 23 May 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/string/source/library/String to 1D Array.vi
Modified: trunk/string/source/library/String to 1D Array.vi
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2014-05-23 21:07:44
|
Revision: 1494
http://sourceforge.net/p/opengtoolkit/svn/1494
Author: labviewer
Date: 2014-05-23 21:07:42 +0000 (Fri, 23 May 2014)
Log Message:
-----------
Attempt to fix the String to 1D Array.vi function when ignore duplicate delimiters is true.
Modified Paths:
--------------
trunk/string/source/library/String to 1D Array.vi
trunk/string/tests/TEST - String to 1D Array.vi
Modified: trunk/string/source/library/String to 1D Array.vi
===================================================================
(Binary files differ)
Modified: trunk/string/tests/TEST - String to 1D Array.vi
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2014-05-23 20:08:13
|
Revision: 1493
http://sourceforge.net/p/opengtoolkit/svn/1493
Author: labviewer
Date: 2014-05-23 20:08:11 +0000 (Fri, 23 May 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/string/source/library/String to 1D Array.vi
Modified: trunk/string/source/library/String to 1D Array.vi
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2014-05-23 20:07:19
|
Revision: 1492
http://sourceforge.net/p/opengtoolkit/svn/1492
Author: labviewer
Date: 2014-05-23 20:07:17 +0000 (Fri, 23 May 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/string/tests/TEST - String to 1D Array.vi
Modified: trunk/string/tests/TEST - String to 1D Array.vi
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jk...@us...> - 2013-09-13 01:20:28
|
Revision: 1491
http://sourceforge.net/p/opengtoolkit/svn/1491
Author: jkring
Date: 2013-09-13 01:20:23 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
Fix [ 127 ] Time Library Fix for QuickDrop and Shortcut Palettes: Add (OpenG) Suffix to OpenG VIs that conflict with built-ins.
TrackerID: 127
Modified Paths:
--------------
trunk/time/source/.vipb
Modified: trunk/time/source/.vipb
===================================================================
--- trunk/time/source/.vipb 2013-09-13 01:15:48 UTC (rev 1490)
+++ trunk/time/source/.vipb 2013-09-13 01:20:23 UTC (rev 1491)
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="0.3" Created_Date="2010-12-15 17:27:07" Modified_Date="2011-05-18 01:04:50" Creator="Jonathon Green" Comments="" ID="e852bc9fb87d8ba5244dfb57b685e3ba">
+<VI_Package_Builder_Settings Version="0.5" Created_Date="2010-12-15 17:27:07" Modified_Date="2013-09-12 18:18:19" Creator="Jonathon Green" Comments="" ID="1add47e2503acaa0727e9289650ab932">
<Library_General_Settings>
<Package_File_Name>oglib_time</Package_File_Name>
- <Library_Version>4.0.0.3</Library_Version>
+ <Library_Version>4.0.1.4</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>..</Library_Output_Folder>
@@ -31,8 +31,8 @@
<Copyright>Copyright (c) 2002 Jean-Pierre Drolet; 2002-2006 Jim Kring; 2010-2011 Jonathon Green</Copyright>
<Packager>OpenG.org</Packager>
<URL>http://wiki.openg.org/Oglib_time</URL>
- <Release_Notes>Package sources upgraded to LabVIEW 2009 (package now compatible with LV2009 or greater)
-Package build with VIPM 2010</Release_Notes>
+ <Release_Notes>Package build with VIPM 2013
+[FIX] 127 - Time Library Fix for QuickDrop and Shortcut Palettes: Add (OpenG) Suffix to OpenG VIs that conflict with built-ins</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
@@ -78,6 +78,16 @@
<Preserve_Hierarchy>true</Preserve_Hierarchy>
<Path/>
</Help_Menu>
+ <Project_Templates>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>false</Preserve_Hierarchy>
+ <Path/>
+ </Project_Templates>
+ <Project_Provider>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>false</Preserve_Hierarchy>
+ <Path/>
+ </Project_Provider>
</Destinations>
<Source_Files>
<Destination_Overrides>
@@ -101,6 +111,7 @@
<Password_Overrides>
<Path>.</Path>
<Password/>
+ <Locked_Only>false</Locked_Only>
</Password_Overrides>
<Namespace_Overrides>
<Path>.</Path>
@@ -149,6 +160,7 @@
<Palette_Disk_Base_Path><menus>\Categories</Palette_Disk_Base_Path>
<Syncing_MNU_file/>
</Functions_Palette_Information>
+ <Apply_Short_Names_to_VI_Titles>false</Apply_Short_Names_to_VI_Titles>
</Palette_Sets>
<Install_Requirements>
<All_Windows>true</All_Windows>
@@ -160,6 +172,10 @@
<Built_LV_Version>false</Built_LV_Version>
<Built_LV_Version_or_greater>true</Built_LV_Version_or_greater>
</Install_Requirements>
+ <LabVIEW>
+ <Shutdown_LabVIEW_Before_Package_Install>false</Shutdown_LabVIEW_Before_Package_Install>
+ <Start_LabVIEW_After_Package_Install>false</Start_LabVIEW_After_Package_Install>
+ </LabVIEW>
</Advanced_Settings>
<Library_Palette_Definition>
<Functions_Palette_Data>
@@ -184,7 +200,7 @@
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Tick Count (ms).vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Tick Count (ms)</NameSub_Menu_Name>
<Short_Name>Tick Count (ms)</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -193,11 +209,12 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Tick Count (ms).vi</Path>
+ <VI_Title>Tick Count (ms) (OpenG)</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Wait (ms).vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Wait (ms)</NameSub_Menu_Name>
<Short_Name>Wait (ms)</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -206,11 +223,12 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Wait (ms).vi</Path>
+ <VI_Title>Wait (ms) (OpenG)</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Wait Until Next ms Multiple.vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Wait Until Next ms Multiple</NameSub_Menu_Name>
<Short_Name>Wait Until Next ms Multiple</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -219,11 +237,12 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Wait Until Next ms Multiple.vi</Path>
+ <VI_Title>Wait Until Next ms Multiple (OpenG)</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Periodic Trigger.vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Periodic Trigger</NameSub_Menu_Name>
<Short_Name>Periodic Trigger</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -232,7 +251,9 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Periodic Trigger.vi</Path>
+ <VI_Title>Periodic Trigger</VI_Title>
</Items_Data>
+ <GUID>50C7C3E1A647FF7C3E6094FB2B01E87C</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jk...@us...> - 2013-09-13 01:15:52
|
Revision: 1490
http://sourceforge.net/p/opengtoolkit/svn/1490
Author: jkring
Date: 2013-09-13 01:15:48 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
Fix [ 126 ] Array Library Fix for QuickDrop and Shortcut Palettes: Add (OpenG) Suffix to OpenG VIs that conflict with built-ins.
BugzID: 126
Modified Paths:
--------------
trunk/array/source/.vipb
Modified: trunk/array/source/.vipb
===================================================================
--- trunk/array/source/.vipb 2013-09-06 01:43:29 UTC (rev 1489)
+++ trunk/array/source/.vipb 2013-09-13 01:15:48 UTC (rev 1490)
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="0.3" Created_Date="2010-12-19 20:21:08" Modified_Date="2011-09-16 13:07:23" Creator="Jonathon Green" Comments="" ID="30ff008803c58eb325bc616264e9eaf7">
+<VI_Package_Builder_Settings Version="0.5" Created_Date="2010-12-19 20:21:08" Modified_Date="2013-09-12 18:11:52" Creator="Jonathon Green" Comments="" ID="5965d290356c97c43a680e57bd3de8bb">
<Library_General_Settings>
<Package_File_Name>oglib_array</Package_File_Name>
- <Library_Version>4.1.0.14</Library_Version>
+ <Library_Version>4.1.1.15</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>..</Library_Output_Folder>
@@ -35,7 +35,8 @@
<Copyright>Copyright (c) 2002-2007 Cal-Bay Systems, Inc., Jim Kring; 2006-2007 MKS Instruments, Inc.; 2010-2011 Jonathon Green</Copyright>
<Packager>OpenG.org</Packager>
<URL>http://wiki.openg.org/Oglib_array</URL>
- <Release_Notes>[FIX] 3390029 - 'Delete elements from 2D array.vi' outputs incorrect result</Release_Notes>
+ <Release_Notes>Package build with VIPM 2013
+[FIX] 126 - File Library Fix for QuickDrop and Shortcut Palettes: Add (OpenG) Suffix to OpenG VIs that conflict with built-ins</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
@@ -81,6 +82,16 @@
<Preserve_Hierarchy>true</Preserve_Hierarchy>
<Path/>
</Help_Menu>
+ <Project_Templates>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>false</Preserve_Hierarchy>
+ <Path/>
+ </Project_Templates>
+ <Project_Provider>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>false</Preserve_Hierarchy>
+ <Path/>
+ </Project_Provider>
</Destinations>
<Source_Files>
<Destination_Overrides>
@@ -104,6 +115,7 @@
<Password_Overrides>
<Path>.</Path>
<Password/>
+ <Locked_Only>false</Locked_Only>
</Password_Overrides>
<Namespace_Overrides>
<Path>.</Path>
@@ -212,6 +224,7 @@
<Palette_Disk_Base_Path><menus>\Categories</Palette_Disk_Base_Path>
<Syncing_MNU_file><Not A Path></Syncing_MNU_file>
</Functions_Palette_Information>
+ <Apply_Short_Names_to_VI_Titles>false</Apply_Short_Names_to_VI_Titles>
</Palette_Sets>
<Install_Requirements>
<All_Windows>true</All_Windows>
@@ -223,6 +236,10 @@
<Built_LV_Version>false</Built_LV_Version>
<Built_LV_Version_or_greater>true</Built_LV_Version_or_greater>
</Install_Requirements>
+ <LabVIEW>
+ <Shutdown_LabVIEW_Before_Package_Install>false</Shutdown_LabVIEW_Before_Package_Install>
+ <Start_LabVIEW_After_Package_Install>false</Start_LabVIEW_After_Package_Install>
+ </LabVIEW>
</Advanced_Settings>
<Library_Palette_Definition>
<Functions_Palette_Data>
@@ -247,7 +264,7 @@
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Conditional Auto-Indexing Tunnel.vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Conditional Auto-Indexing Tunnel</NameSub_Menu_Name>
<Short_Name>Conditional Auto-Indexing Tunnel</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -256,11 +273,12 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Conditional Auto-Indexing Tunnel.vi</Path>
+ <VI_Title>Conditional Auto-Indexing Tunnel</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Filter 1D Array.vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Filter 1D Array</NameSub_Menu_Name>
<Short_Name>Filter 1D Array</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -269,11 +287,12 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Filter 1D Array.vi</Path>
+ <VI_Title>Filter 1D Array</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Remove Duplicates from 1D Array.vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Remove Duplicates from 1D Array</NameSub_Menu_Name>
<Short_Name>Remove Duplicates from 1D Array</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -282,6 +301,7 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Remove Duplicates from 1D Array.vi</Path>
+ <VI_Title>Remove Duplicates from 1D Array</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
@@ -295,11 +315,12 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Reverse 2D Array.vi</Path>
+ <VI_Title>Reverse 2D Array</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Slice 1D Array.vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Slice 1D Array</NameSub_Menu_Name>
<Short_Name>Slice 1D Array</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -308,11 +329,12 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Slice 1D Array.vi</Path>
+ <VI_Title>Slice 1D Array</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Reorder Array2.vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Reorder Array</NameSub_Menu_Name>
<Short_Name>Reorder Array2</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -321,11 +343,12 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Reorder Array2.vi</Path>
+ <VI_Title>Reorder Array</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Index Array Elements.vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Index Array Elements</NameSub_Menu_Name>
<Short_Name>Index Array Elements</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -334,6 +357,7 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Index Array Elements.vi</Path>
+ <VI_Title>Index Array Elements</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
@@ -347,6 +371,7 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Search Array.vi</Path>
+ <VI_Title>Search Array</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
@@ -360,11 +385,12 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Delete Elements from Array.vi</Path>
+ <VI_Title>Delete Elements from Array</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Empty Array.vi</NameSub_Menu_Name>
+ <NameSub_Menu_Name>Empty Array?</NameSub_Menu_Name>
<Short_Name>Empty Array</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
@@ -373,6 +399,7 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Empty Array.vi</Path>
+ <VI_Title>Empty Array? (OpenG)</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
@@ -386,7 +413,9 @@
</Position>
<Icon>00000000</Icon>
<Path>library\Sort Array.vi</Path>
+ <VI_Title>Sort Array</VI_Title>
</Items_Data>
+ <GUID>C9E891CC5B516BDD18EF33182A2859DB</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2013-03-17 15:06:36
|
Revision: 1487
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1487&view=rev
Author: labviewer
Date: 2013-03-17 15:06:30 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
various minor edits
Modified Paths:
--------------
trunk/lvzip/c_source/Makefile.vxworks
trunk/lvzip/c_source/gzread.c
trunk/lvzip/c_source/inflate.c
trunk/lvzip/c_source/ioapi.h
trunk/lvzip/c_source/iomem.h
trunk/lvzip/c_source/mztools.c
trunk/lvzip/c_source/unzip.c
trunk/lvzip/c_source/zip.h
Modified: trunk/lvzip/c_source/Makefile.vxworks
===================================================================
--- trunk/lvzip/c_source/Makefile.vxworks 2013-03-17 15:01:38 UTC (rev 1486)
+++ trunk/lvzip/c_source/Makefile.vxworks 2013-03-17 15:06:30 UTC (rev 1487)
@@ -19,10 +19,10 @@
# directory. Make will automatically locate the source file and
# compile it.
OBJECTS := $(OBJ_DIR)/adler32.o $(OBJ_DIR)/compress.o $(OBJ_DIR)/crc32.o $(OBJ_DIR)/deflate.o \
- $(OBJ_DIR)\gzclose.o $(OBJ_DIR)\gzlib.o $(OBJ_DIR)\gzread.o $(OBJ_DIR)\gzwrite.o \
+ $(OBJ_DIR)/gzclose.o $(OBJ_DIR)/gzlib.o $(OBJ_DIR)/gzread.o $(OBJ_DIR)/gzwrite.o \
$(OBJ_DIR)/inffast.o $(OBJ_DIR)/infback.o $(OBJ_DIR)/inflate.o $(OBJ_DIR)/inftrees.o \
$(OBJ_DIR)/ioapi.o $(OBJ_DIR)/iomem.o $(OBJ_DIR)/lvutil.o $(OBJ_DIR)/lvapi.o $(OBJ_DIR)/mztools.o \
- $(OBJ_DIR)/trees.o $(OBJ_DIR)/uncompr.o $(OBJ_DIR)/unzip.o $(OBJ_DIR)/zip.o $(OBJ_DIR)/zutil.o
+ $(OBJ_DIR)/trees.o $(OBJ_DIR)/uncompr.o $(OBJ_DIR)/unzip.o $(OBJ_DIR)/zip.o $(OBJ_DIR)/zutil.o
# This is the name of the output shared library.
PROJECT_TARGETS := $(OBJ_DIR)/lvzlib.out
@@ -50,11 +50,11 @@
# copy this rule and modify its extension and compile flags for the
# required source file type.
$(OBJ_DIR)/%.o : %.c
- ccppc $(CFLAGS) $(CC_ARCH_SPEC) -Wall -MD -MP $(ADDED_CFLAGS) $(IDE_INCLUDES) $(ADDED_INCLUDES) -DCPU=$(CPU) -DTOOL_FAMILY=$(TOOL_FAMILY) -DTOOL=$(TOOL) -D_WRS_KERNEL $(DEFINES) -o "$@" -c "$<"
+ ccppc $(CFLAGS) $(CC_ARCH_SPEC) -Wall -MD -MP $(ADDED_CFLAGS) $(IDE_INCLUDES) $(ADDED_INCLUDES) -DCPU=$(CPU) -DTOOL_FAMILY=$(TOOL_FAMILY) -DTOOL=$(TOOL) -D_WRS_KERNEL $(DEFINES) -o "$@" -c "$<"
# Adapted rule for .cpp files
$(OBJ_DIR)/%.o : %.cpp
- c++ppc $(CFLAGS) $(CC_ARCH_SPEC) -Wall -MD -MP $(ADDED_CFLAGS) $(IDE_INCLUDES) $(ADDED_INCLUDES) -DCPU=$(CPU) -DTOOL_FAMILY=$(TOOL_FAMILY) -DTOOL=$(TOOL) -D_WRS_KERNEL $(DEFINES) -o "$@" -c "$<"
+ c++ppc $(CFLAGS) $(CC_ARCH_SPEC) -Wall -MD -MP $(ADDED_CFLAGS) $(IDE_INCLUDES) $(ADDED_INCLUDES) -DCPU=$(CPU) -DTOOL_FAMILY=$(TOOL_FAMILY) -DTOOL=$(TOOL) -D_WRS_KERNEL $(DEFINES) -o "$@" -c "$<"
all : check_objectdir $(PROJECT_TARGETS)
Modified: trunk/lvzip/c_source/gzread.c
===================================================================
--- trunk/lvzip/c_source/gzread.c 2013-03-17 15:01:38 UTC (rev 1486)
+++ trunk/lvzip/c_source/gzread.c 2013-03-17 15:06:30 UTC (rev 1487)
@@ -378,7 +378,6 @@
}
/* -- see zlib.h -- */
-//#undef gzgetc
int ZEXPORT gzgetc(file)
gzFile file;
{
Modified: trunk/lvzip/c_source/inflate.c
===================================================================
--- trunk/lvzip/c_source/inflate.c 2013-03-17 15:01:38 UTC (rev 1486)
+++ trunk/lvzip/c_source/inflate.c 2013-03-17 15:06:30 UTC (rev 1487)
@@ -429,10 +429,10 @@
/* check function to use adler32() for zlib or crc32() for gzip */
#ifdef GUNZIP
-# define UPDATE(check, buf, len) \
+# define UPDATE_CHECK(check, buf, len) \
(state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
#else
-# define UPDATE(check, buf, len) adler32(check, buf, len)
+# define UPDATE_CHECK(check, buf, len) adler32(check, buf, len)
#endif
/* check macros for header crc */
@@ -1178,7 +1178,7 @@
state->total += out;
if (out)
strm->adler = state->check =
- UPDATE(state->check, put - out, out);
+ UPDATE_CHECK(state->check, put - out, out);
out = left;
if ((
#ifdef GUNZIP
@@ -1241,7 +1241,7 @@
state->total += out;
if (state->wrap && out)
strm->adler = state->check =
- UPDATE(state->check, strm->next_out - out, out);
+ UPDATE_CHECK(state->check, strm->next_out - out, out);
strm->data_type = state->bits + (state->last ? 64 : 0) +
(state->mode == TYPE ? 128 : 0) +
(state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
Modified: trunk/lvzip/c_source/ioapi.h
===================================================================
--- trunk/lvzip/c_source/ioapi.h 2013-03-17 15:01:38 UTC (rev 1486)
+++ trunk/lvzip/c_source/ioapi.h 2013-03-17 15:06:30 UTC (rev 1487)
@@ -23,8 +23,8 @@
#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
- // Linux needs this to support file operation on files larger then 4+GB
- // But might need better if/def to select just the platforms that needs them.
+ /* Linux needs this to support file operation on files larger then 4+GB
+ But might need better if/def to select just the platforms that needs them. */
#ifndef __USE_FILE_OFFSET64
#define __USE_FILE_OFFSET64
@@ -186,8 +186,8 @@
#define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
#define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
-//#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
-//#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
+/*#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))*/
+/*#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))*/
#define ZCLOSE64(filefunc,filestream, output) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream,output))
#define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream))
Modified: trunk/lvzip/c_source/iomem.h
===================================================================
--- trunk/lvzip/c_source/iomem.h 2013-03-17 15:01:38 UTC (rev 1486)
+++ trunk/lvzip/c_source/iomem.h 2013-03-17 15:06:30 UTC (rev 1487)
@@ -9,7 +9,7 @@
extern "C" {
#endif
-void fill_mem_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def, LStrHandle *memory));
+void fill_mem_filefunc(zlib_filefunc64_def* pzlib_filefunc_def, LStrHandle *memory);
#ifdef __cplusplus
}
Modified: trunk/lvzip/c_source/mztools.c
===================================================================
--- trunk/lvzip/c_source/mztools.c 2013-03-17 15:01:38 UTC (rev 1486)
+++ trunk/lvzip/c_source/mztools.c 2013-03-17 15:06:30 UTC (rev 1487)
@@ -222,7 +222,7 @@
{
int entriesZip = entries;
char header[22];
- char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
+ char* comment = ""; /* "ZIP File recovered by zlib/minizip/mztools" */
int comsize = (int) strlen(comment);
if (entriesZip > 0xffff) {
entriesZip = 0xffff;
Modified: trunk/lvzip/c_source/unzip.c
===================================================================
--- trunk/lvzip/c_source/unzip.c 2013-03-17 15:01:38 UTC (rev 1486)
+++ trunk/lvzip/c_source/unzip.c 2013-03-17 15:06:30 UTC (rev 1487)
@@ -956,7 +956,7 @@
if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
err=UNZ_ERRNO;
- // relative offset of local header
+ /* relative offset of local header */
if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
err=UNZ_ERRNO;
file_info_internal.offset_curfile = uL;
@@ -979,7 +979,7 @@
lSeek -= uSizeRead;
}
- // Read extrafield
+ /* Read extrafield */
if ((err==UNZ_OK) && (extraField!=NULL))
{
ZPOS64_T uSizeRead ;
@@ -1010,7 +1010,7 @@
{
uLong acc = 0;
- // since lSeek now points to after the extra field we need to move back
+ /* since lSeek now points to after the extra field we need to move back */
lSeek -= file_info.size_file_extra;
if (lSeek!=0)
@@ -1627,6 +1627,7 @@
zdecode(s->keys,s->pcrc_32_tab,source[i]);
s->pfile_in_zip_read->pos_in_zipfile+=12;
+ pfile_in_zip_read_info->rest_read_compressed -= 12;
s->encrypted=1;
}
# endif
Modified: trunk/lvzip/c_source/zip.h
===================================================================
--- trunk/lvzip/c_source/zip.h 2013-03-17 15:01:38 UTC (rev 1486)
+++ trunk/lvzip/c_source/zip.h 2013-03-17 15:06:30 UTC (rev 1487)
@@ -44,7 +44,7 @@
ZEXTERN "C" {
#endif
-//#define HAVE_BZIP2
+/*#define HAVE_BZIP2*/
#ifndef _ZLIB_H
#include "zlib.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2013-03-17 15:01:50
|
Revision: 1486
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1486&view=rev
Author: labviewer
Date: 2013-03-17 15:01:38 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Add a define for vxworks
Modified Paths:
--------------
trunk/lvzip/c_source/zconf.h
Modified: trunk/lvzip/c_source/zconf.h
===================================================================
--- trunk/lvzip/c_source/zconf.h 2012-07-23 21:28:24 UTC (rev 1485)
+++ trunk/lvzip/c_source/zconf.h 2013-03-17 15:01:38 UTC (rev 1486)
@@ -442,6 +442,9 @@
#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
# define Z_HAVE_UNISTD_H
#endif
+#if (defined(__vxworks) || defined(__vxworks__)) && !defined(Z_HAVE_UNISTD_H)
+# define Z_HAVE_UNISTD_H
+#endif
#ifndef Z_SOLO
# if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2012-07-23 21:28:32
|
Revision: 1485
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1485&view=rev
Author: labviewer
Date: 2012-07-23 21:28:24 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/lvzip/tests/lvzip-test add to empty archive.vi
trunk/lvzip/tests/lvzip-test-delete files from archive.vi
trunk/lvzip/tests/lvzip-test-memory stream.vi
Modified: trunk/lvzip/tests/lvzip-test add to empty archive.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/tests/lvzip-test-delete files from archive.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/tests/lvzip-test-memory stream.vi
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2012-07-23 21:26:23
|
Revision: 1484
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1484&view=rev
Author: labviewer
Date: 2012-07-23 21:26:16 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Modify 64 Bit support
Modified Paths:
--------------
trunk/lvzip/c_source/Makefile
trunk/lvzip/c_source/Makefile.in
trunk/lvzip/c_source/Makefile.vxworks
trunk/lvzip/c_source/Makefile.x64
trunk/lvzip/c_source/lvutil.c
trunk/lvzip/c_source/lvutil.h
trunk/lvzip/c_source/zalias.h
trunk/lvzip/c_source/zip.h
trunk/lvzip/c_source/zlibvc.vcproj
Added Paths:
-----------
trunk/lvzip/c_source/lvapi.c
Modified: trunk/lvzip/c_source/Makefile
===================================================================
--- trunk/lvzip/c_source/Makefile 2012-07-23 21:23:01 UTC (rev 1483)
+++ trunk/lvzip/c_source/Makefile 2012-07-23 21:26:16 UTC (rev 1484)
@@ -25,7 +25,7 @@
# -Wstrict-prototypes -Wmissing-prototypes
CINDIR=/usr/local/lv70/cintools
-SFLAGS=-O3 -fPIC -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -L$(CINDIR)
+SFLAGS=-O3 -fPIC -fvisibility=hidden -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -L$(CINDIR)
LDFLAGS=
TEST_LDFLAGS=-L. libz.a
LDSHARED=gcc
@@ -57,12 +57,12 @@
OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
-OBJL = unzip.o zip.o lvutil.o ioapi.o iomem.o mztools.o
+OBJL = lvutil.o ioapi.o iomem.o mztools.o unzip.o zip.o
OBJC = $(OBJZ) $(OBJL) $(OBJG)
PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
-PIC_OBJL = unzip.lo zip.lo lvutil.lo ioapi.lo iomem.lo mztools.lo
+PIC_OBJL = lvapi.lo lvutil.lo ioapi.lo iomem.lo mztools.lo unzip.lo zip.lo
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJL) $(PIC_OBJG)
# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
Modified: trunk/lvzip/c_source/Makefile.in
===================================================================
--- trunk/lvzip/c_source/Makefile.in 2012-07-23 21:23:01 UTC (rev 1483)
+++ trunk/lvzip/c_source/Makefile.in 2012-07-23 21:26:16 UTC (rev 1484)
@@ -58,13 +58,13 @@
OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
-OBJL = lvutil.o ioapi.o iomem.o mztools.o
+OBJL = lvapi.o lvutil.o ioapi.o iomem.o mztools.o
OBJC = $(OBJZ) $(OBJL) $(OBJG)
PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
-PIC_OBJL = lvutil.lo ioapi.lo iomem.lo mztools.lo
+PIC_OBJL = lvapi.lo lvutil.lo ioapi.lo iomem.lo mztools.lo
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJL) $(PIC_OBJG)
# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
Modified: trunk/lvzip/c_source/Makefile.vxworks
===================================================================
--- trunk/lvzip/c_source/Makefile.vxworks 2012-07-23 21:23:01 UTC (rev 1483)
+++ trunk/lvzip/c_source/Makefile.vxworks 2012-07-23 21:26:16 UTC (rev 1484)
@@ -18,10 +18,11 @@
# List all the *compiled* object files here, under the OBJ_DIR
# directory. Make will automatically locate the source file and
# compile it.
-OBJECTS := $(OBJ_DIR)/adler32.o $(OBJ_DIR)/compress.o $(OBJ_DIR)/crc32.o $(OBJ_DIR)/uncompr.o $(OBJ_DIR)/deflate.o \
- $(OBJ_DIR)/trees.o $(OBJ_DIR)/zutil.o $(OBJ_DIR)/inflate.o $(OBJ_DIR)/infback.o $(OBJ_DIR)/inftrees.o \
- $(OBJ_DIR)/inffast.o $(OBJ_DIR)/ioapi.o $(OBJ_DIR)/iomem.o $(OBJ_DIR)/lvutil.o $(OBJ_DIR)/mztools.o \
- $(OBJ_DIR)/zip.o $(OBJ_DIR)/unzip.o
+OBJECTS := $(OBJ_DIR)/adler32.o $(OBJ_DIR)/compress.o $(OBJ_DIR)/crc32.o $(OBJ_DIR)/deflate.o \
+ $(OBJ_DIR)\gzclose.o $(OBJ_DIR)\gzlib.o $(OBJ_DIR)\gzread.o $(OBJ_DIR)\gzwrite.o \
+ $(OBJ_DIR)/inffast.o $(OBJ_DIR)/infback.o $(OBJ_DIR)/inflate.o $(OBJ_DIR)/inftrees.o \
+ $(OBJ_DIR)/ioapi.o $(OBJ_DIR)/iomem.o $(OBJ_DIR)/lvutil.o $(OBJ_DIR)/lvapi.o $(OBJ_DIR)/mztools.o \
+ $(OBJ_DIR)/trees.o $(OBJ_DIR)/uncompr.o $(OBJ_DIR)/unzip.o $(OBJ_DIR)/zip.o $(OBJ_DIR)/zutil.o
# This is the name of the output shared library.
PROJECT_TARGETS := $(OBJ_DIR)/lvzlib.out
Modified: trunk/lvzip/c_source/Makefile.x64
===================================================================
--- trunk/lvzip/c_source/Makefile.x64 2012-07-23 21:23:01 UTC (rev 1483)
+++ trunk/lvzip/c_source/Makefile.x64 2012-07-23 21:26:16 UTC (rev 1484)
@@ -13,40 +13,50 @@
SOURCES=adler32.c \
compress.c \
crc32.c \
- uncompr.c \
deflate.c \
- trees.c \
- zutil.c \
+ gzclose.c \
+ gzlib.c \
+ gzread.c \
+ gzwrite.c \
+ infback.c \
+ inffast.c \
inflate.c \
- infback.c \
inftrees.c \
- inffast.c \
ioapi.c \
iowin.c \
iomem.c \
+ lvapi.c \
lvutil.c \
mztools.c \
+ trees.c \
+ uncompr.c \
+ unzip.c \
zip.c \
- unzip.c
-
+ zutil.c
+
OBJS=$(OUTDIR)\adler32.obj \
$(OUTDIR)\compress.obj \
$(OUTDIR)\crc32.obj \
- $(OUTDIR)\uncompr.obj \
$(OUTDIR)\deflate.obj \
- $(OUTDIR)\trees.obj \
- $(OUTDIR)\zutil.obj \
+ $(OUTDIR)\gzclose.obj \
+ $(OUTDIR)\gzlib.obj \
+ $(OUTDIR)\gzread.obj \
+ $(OUTDIR)\gzwrite.obj \
+ $(OUTDIR)\infback.obj \
+ $(OUTDIR)\inffast.obj \
$(OUTDIR)\inflate.obj \
- $(OUTDIR)\infback.obj \
$(OUTDIR)\inftrees.obj \
- $(OUTDIR)\inffast.obj \
$(OUTDIR)\ioapi.obj \
$(OUTDIR)\iowin.obj \
$(OUTDIR)\iomem.obj \
+ $(OUTDIR)\lvapi.obj \
$(OUTDIR)\lvutil.obj \
$(OUTDIR)\mztools.obj \
+ $(OUTDIR)\trees.obj \
+ $(OUTDIR)\uncompr.obj \
+ $(OUTDIR)\unzip.obj \
$(OUTDIR)\zip.obj \
- $(OUTDIR)\unzip.obj
+ $(OUTDIR)\zutil.obj
ELIBS=user32.lib kernel32.lib labview.lib
Added: trunk/lvzip/c_source/lvapi.c
===================================================================
--- trunk/lvzip/c_source/lvapi.c (rev 0)
+++ trunk/lvzip/c_source/lvapi.c 2012-07-23 21:26:16 UTC (rev 1484)
@@ -0,0 +1,200 @@
+#define ZLIB_INTERNAL
+#include "zlib.h"
+#include "lvutil.h"
+#include "zip.h"
+#include "unzip.h"
+
+#ifndef VERSIONMADEBY
+# define VERSIONMADEBY (0x0) /* platform depedent */
+#endif
+
+LibAPI(const char *) lvzlib_zlibVersion(void)
+{
+ return zlibVersion();
+}
+
+LibAPI(int) lvzlib_compress(Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen, int level)
+{
+ return compress2(dest, destLen, source, sourceLen, level);
+}
+
+LibAPI(int) lvzlib_uncompress(Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen)
+{
+ return uncompress(dest, destLen, source, sourceLen);
+}
+
+LibAPI(uInt32) lvzlib_crc32(uInt32 crc, const Bytef *buf, uInt32 len)
+{
+ return crc32(crc, buf, len);
+}
+
+LibAPI(int) lvzlib__openDummy(LStrHandle *name, UPtr *node)
+{
+ Unused(name);
+ *node = NULL;
+ return mgNotSupported;
+}
+
+LibAPI(int) lvzlib_noProp(UPtr node, uInt32 attr, UPtr data)
+{
+ Unused(node);
+ Unused(attr);
+ Unused(data);
+ return mgNotSupported;
+}
+
+LibAPI(int) lvzlib_zipCleanup(zipFile node)
+{
+ return zipClose2(node, NULL, NULL);
+}
+
+LibAPI(int) lvzlib_unzipCleanup(unzFile node)
+{
+ return unzClose(node);
+}
+
+LibAPI(int) lvzlib_zipOpen(const void *pathname, int append, LStrHandle *globalcomment,
+ zlib_filefunc64_def* pzlib_filefunc_def, zipFile *file)
+{
+ zipcharpc comment;
+ *file = zipOpen2_64(pathname, append, &comment, pzlib_filefunc_def);
+ if (*file)
+ {
+ if (comment)
+ {
+ size_t len = strlen(comment);
+ MgErr err = NumericArrayResize(uB, 1, (UHandle*)globalcomment, len);
+ if (!err)
+ {
+ MoveBlock(comment, LStrBuf(**globalcomment), len);
+ LStrLen(**globalcomment) = (int32)len;
+ }
+ }
+ return Z_OK;
+ }
+ return Z_ERRNO;
+}
+
+LibAPI(int) lvzlib_zipOpenNewFileInZip(zipFile *file, const char* filename,
+ const zip_fileinfo* zipfi, const void* extrafield_local,
+ uInt size_extrafield_local, const void* extrafield_global,
+ uInt size_extrafield_global, const char* comment, int method,
+ int level, int raw, int windowBits, int memLevel, int strategy,
+ const char* password, uLong crcForCrypting, int zip64)
+{
+ return zipOpenNewFileInZip4_64(*file, filename, zipfi, extrafield_local, size_extrafield_local,
+ extrafield_global, size_extrafield_global, comment, method, level,
+ raw, windowBits, memLevel, strategy, password[0] ? password : NULL,
+ crcForCrypting, VERSIONMADEBY, 0, zip64);
+}
+
+LibAPI(int) lvzlib_zipWriteInFileInZip(zipFile *file, const voidp buf, uInt32 len)
+{
+ return zipWriteInFileInZip(*file, buf, len);
+}
+
+LibAPI(int) lvzlib_zipCloseFileInZipRaw(zipFile *file, uInt32 uncompressedSize, uInt32 crc32)
+{
+ return zipCloseFileInZipRaw64(*file, uncompressedSize, crc32);
+}
+
+LibAPI(int) lvzlib_zipCloseFileInZipRaw64(zipFile *file, uInt64 uncompressedSize, uInt32 crc32)
+{
+ return zipCloseFileInZipRaw64(*file, uncompressedSize, crc32);
+}
+
+LibAPI(int) lvzlib_zipClose(zipFile *file, const char *globalComment, LStrHandle *stream)
+{
+ return zipClose2(*file, globalComment, stream);
+}
+
+LibAPI(int) lvzlib_unzOpen(const void *pathname, zlib_filefunc64_def* pzlib_filefunc_def, unzFile *file)
+{
+ *file = unzOpen2_64(pathname, pzlib_filefunc_def);
+ if (*file)
+ return Z_OK;
+ return Z_ERRNO;
+}
+
+LibAPI(int) lvzlib_unzClose(unzFile *file)
+{
+ return unzClose(*file);
+}
+
+LibAPI(int) lvzlib_unzGetGlobalInfo(unzFile *file, unz_global_info* pglobal_info)
+{
+ return unzGetGlobalInfo(*file, pglobal_info);
+}
+
+LibAPI(int) lvzlib_unzGetGlobalInfo64(unzFile *file, unz_global_info64* pglobal_info)
+{
+ return unzGetGlobalInfo64(*file, pglobal_info);
+}
+
+LibAPI(int) lvzlib_unzGetGlobalComment(unzFile *file, char *szComment, uInt32 len)
+{
+ return unzGetGlobalComment(*file, szComment, len);
+}
+
+LibAPI(int) lvzlib_unzLocateFile(unzFile *file, const char *szFileName, int iCaseSensitivity)
+{
+ return unzLocateFile(*file, szFileName, iCaseSensitivity);
+}
+
+LibAPI(int) lvzlib_unzGetCurrentFileInfoLen(unzFile *file, unz_file_info * pfile_info)
+{
+ return unzGetCurrentFileInfo(*file, pfile_info, NULL, 0, NULL, 0, NULL, 0);
+}
+
+LibAPI(int) lvzlib_unzGetCurrentFileInfo(unzFile *file, unz_file_info * pfile_info,
+ char * szFileName, uInt32 fileNameBufferSize,
+ void *extraField, uInt32 extraFieldBufferSize,
+ char* szComment, uInt32 commentBufferSize)
+{
+ return unzGetCurrentFileInfo(*file, pfile_info, szFileName, fileNameBufferSize,
+ extraField, extraFieldBufferSize, szComment, commentBufferSize);
+}
+
+LibAPI(int) lvzlib_unzOpenCurrentFile(unzFile *file, int32* method, int32* level, int16 raw, const char* password)
+{
+ return unzOpenCurrentFile3(*file, method, level, raw, password[0] ? password : NULL);
+}
+
+LibAPI(int) lvzlib_unzGetLocalExtrafield(unzFile *file, LStrHandle *extra)
+{
+ int len = unzGetLocalExtrafield(*file, NULL, 0);
+ if (len > 0)
+ {
+ MgErr err = NumericArrayResize(uB, 1, (UHandle*)extra, len);
+ if (!err)
+ {
+ LStrLen(**extra) = len;
+ return unzGetLocalExtrafield(*file, LStrBuf(**extra), len);
+ }
+ else
+ len = Z_MEM_ERROR;
+ }
+ return len;
+}
+
+LibAPI(int) lvzlib_unzReadCurrentFile(unzFile *file, voidp buffer, uInt32 size)
+{
+ return unzReadCurrentFile(*file, buffer, size);
+}
+
+LibAPI(int) lvzlib_unzCloseCurrentFile(unzFile *file)
+{
+ return unzCloseCurrentFile(*file);
+}
+
+LibAPI(int) lvzlib_unzGoToFirstFile(unzFile *file)
+{
+ return unzGoToFirstFile(*file);
+}
+
+LibAPI(int) lvzlib_unzGoToNextFile(unzFile *file)
+{
+ return unzGoToNextFile(*file);
+}
Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c 2012-07-23 21:23:01 UTC (rev 1483)
+++ trunk/lvzip/c_source/lvutil.c 2012-07-23 21:26:16 UTC (rev 1484)
@@ -525,12 +525,12 @@
#endif
#endif
-extern void ZEXPORT DLLVersion(uChar* version)
+LibAPI(void) DLLVersion(uChar* version)
{
- sprintf((char*)version, "lvzlib date: %s, time: %s",__DATE__,__TIME__);
+ sprintf((char*)version, "lvzlib V 2.1, date: %s, time: %s",__DATE__,__TIME__);
}
-extern MgErr ZEXPORT LVPath_HasResourceFork(Path path, int32 *hasResFork)
+LibAPI(MgErr) LVPath_HasResourceFork(Path path, int32 *hasResFork)
{
MgErr err = noErr;
#if MacOS
@@ -566,7 +566,7 @@
return err;
}
-extern MgErr ZEXPORT LVPath_EncodeMacbinary(Path srcPath, Path dstPath)
+LibAPI(MgErr) LVPath_EncodeMacbinary(Path srcPath, Path dstPath)
{
#if MacOS
FSSpec srcFSSpec;
@@ -586,7 +586,7 @@
#endif
}
-extern MgErr ZEXPORT LVPath_DecodeMacbinary(Path srcPath, Path dstPath)
+LibAPI(MgErr) LVPath_DecodeMacbinary(Path srcPath, Path dstPath)
{
#if MacOS
FSSpec srcFSSpec;
@@ -606,7 +606,7 @@
#endif
}
-extern MgErr ZEXPORT LVPath_OpenFile(LVRefNum *refnum, Path path, uInt8 rsrc, uInt32 openMode, uInt32 denyMode)
+LibAPI(MgErr) LVPath_OpenFile(LVRefNum *refnum, Path path, uInt8 rsrc, uInt32 openMode, uInt32 denyMode)
{
MgErr err;
int32 type;
@@ -852,7 +852,7 @@
return err;
}
-extern MgErr ZEXPORT LVPath_UtilFileInfo(Path path,
+LibAPI(MgErr) LVPath_UtilFileInfo(Path path,
uInt8 write,
uInt8 *isDirectory,
LVFileInfo *fileInfo,
@@ -1157,31 +1157,36 @@
return err;
}
-extern long ZEXPORT InitializeFileFuncs (zlib_filefunc64_def* pzlib_filefunc_def, LStrHandle *memory)
+LibAPI(MgErr) InitializeFileFuncs(LStrHandle filefunc_def)
{
- DoDebugger();
-
- if (pzlib_filefunc_def)
- {
- if (memory)
- {
- fill_mem_filefunc(pzlib_filefunc_def, memory);
- }
- else
- {
+ MgErr err = NumericArrayResize(uB, 1, (UHandle*)&filefunc_def, sizeof(zlib_filefunc64_def));
+ if (!err)
+ {
+ zlib_filefunc64_def* pzlib_filefunc_def = (zlib_filefunc64_def*)LStrBuf(*filefunc_def);
+ LStrLen(*filefunc_def) = sizeof(zlib_filefunc64_def);
#if Win32
fill_win32_filefunc64A(pzlib_filefunc_def);
#else
fill_fopen64_filefunc(pzlib_filefunc_def);
#endif
- }
- return mgNoErr;
+ }
+ return err;
+}
+
+LibAPI(MgErr) InitializeStreamFuncs(LStrHandle filefunc_def, LStrHandle *memory)
+{
+ MgErr err = NumericArrayResize(uB, 1, (UHandle*)&filefunc_def, sizeof(zlib_filefunc64_def));
+ if (!err)
+ {
+ zlib_filefunc64_def* pzlib_filefunc_def = (zlib_filefunc64_def*)LStrBuf(*filefunc_def);
+ LStrLen(*filefunc_def) = sizeof(zlib_filefunc64_def);
+
+ fill_mem_filefunc(pzlib_filefunc_def, memory);
}
- else
- return sizeof(zlib_filefunc64_def);
+ return err;
}
-extern MgErr ZEXPORT LVPath_ToText(Path path, CStr str, int32 *len)
+LibAPI(MgErr) LVPath_ToText(Path path, CStr str, int32 *len)
{
MgErr err;
LStrPtr lstr;
Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h 2012-07-23 21:23:01 UTC (rev 1483)
+++ trunk/lvzip/c_source/lvutil.h 2012-07-23 21:26:16 UTC (rev 1484)
@@ -44,6 +44,12 @@
#error No target defined
#endif
+#if Win32
+ #define LibAPI(retval) extern __declspec(dllexport) retval
+#else
+ #define LibAPI(retval) __attribute__((visibility ("default"))) extern retval
+#endif
+
#if defined(DEBUG)
#if Win32
#if defined(_CVI_DEBUG_)
@@ -70,16 +76,38 @@
*/
#endif
-typedef char int8;
-typedef unsigned char uInt8;
-typedef uInt8 uChar;
-typedef short int16;
-typedef unsigned short uInt16;
-typedef long int32;
-typedef unsigned long uInt32;
-typedef float float32;
-typedef double float64;
+#ifndef Unused
+/* The macro Unused can be used to avoid compiler warnings for
+unused parameters or locals. */
+# ifdef __cplusplus
+/* This implementation of Unused is safe for const parameters. */
+# define Unused(var_or_param) _Unused((const void *)&var_or_param)
+ inline void _Unused(const void *) {}
+# elif MSWin
+/* This implementation of Unused is not safe for const parameters. */
+# define Unused(var_or_param) var_or_param=var_or_param
+# else
+# define Unused(var_or_param)
+# endif
+#endif /* Unused */
+typedef signed char int8;
+typedef unsigned char uInt8;
+typedef uInt8 uChar;
+typedef signed short int16;
+typedef unsigned short uInt16;
+typedef signed int int32;
+typedef unsigned int uInt32;
+#if Win32
+typedef signed __int64 int64;
+typedef unsigned __int64 uInt64;
+#else
+typedef signed long long int64;
+typedef unsigned long long uInt64;
+#endif
+typedef float float32;
+typedef double float64;
+
#define Private(T) typedef struct T##_t { void *p; } *T
#define PrivateH(T) struct T##_t; typedef struct T##_t **T
@@ -199,7 +227,7 @@
} LVPoint;
typedef uChar Str255[256], *PStr, *CStr, *UPtr, **UHandle;
-typedef const uChar *ConstCStr, *ConstPStr, ConstStr255[256];
+typedef const uChar *ConstCStr, *ConstPStr, *ConstUPtr, ConstStr255[256];
#define PStrBuf(b) (&((PStr)(b))[1])
#define PStrLen(b) (((PStr)(b))[0]) /* # of chars in string */
@@ -258,39 +286,42 @@
MgErr FNewRefNum(Path path, File fd, LVRefNum* refnum);
int32 DbgPrintf(CStr fmt, ...);
-UPtr DSNewPClr(int32);
+UPtr DSNewPClr(size_t size);
MgErr DSDisposePtr(UPtr);
-UHandle DSNewHClr(int32 size);
-MgErr DSSetHandleSize(UHandle, int32);
+UHandle DSNewHClr(size_t size);
+MgErr DSSetHandleSize(UHandle, size_t);
int32 DSGetHandleSize(UHandle);
MgErr DSDisposeHandle(UHandle);
-MgErr NumericArrayResize(int32, int32, UHandle*, int32);
+void MoveBlock(ConstUPtr ps, UPtr pd, size_t size);
+MgErr NumericArrayResize(int32, int32, UHandle*, size_t);
+
#define Min(a, b) ((a) < (b)) ? (a) : (b)
#define Max(a, b) ((a) > (b)) ? (a) : (b)
/* Our exported functions */
-ZEXTERN void ZEXPORT DLLVersion OF((uChar* Version));
+LibAPI(void) DLLVersion OF((uChar* Version));
-ZEXTERN MgErr ZEXPORT LVPath_ToText OF((Path path, CStr str, int32 *len));
-ZEXTERN MgErr ZEXPORT LVPath_HasResourceFork OF((Path path, int32 *hasResFork));
-ZEXTERN MgErr ZEXPORT LVPath_EncodeMacbinary OF((Path srcFileName, Path dstFileName));
-ZEXTERN MgErr ZEXPORT LVPath_DecodeMacbinary OF((Path srcFileName, Path dstFileName));
+LibAPI(MgErr) LVPath_ToText OF((Path path, CStr str, int32 *len));
+LibAPI(MgErr) LVPath_HasResourceFork OF((Path path, int32 *hasResFork));
+LibAPI(MgErr) LVPath_EncodeMacbinary OF((Path srcFileName, Path dstFileName));
+LibAPI(MgErr) LVPath_DecodeMacbinary OF((Path srcFileName, Path dstFileName));
-ZEXTERN MgErr ZEXPORT LVPath_UtilFileInfo OF((Path path,
+LibAPI(MgErr) LVPath_UtilFileInfo OF((Path path,
uInt8 write,
uInt8 *isDirectory,
LVFileInfo *finderInfo,
LStrHandle comment));
-ZEXTERN MgErr ZEXPORT LVPath_OpenFile OF((LVRefNum *refnum,
+LibAPI(MgErr) LVPath_OpenFile OF((LVRefNum *refnum,
Path path,
uInt8 rsrc,
uInt32 openMode,
uInt32 denyMode));
-ZEXTERN long ZEXPORT InitializeFileFuncs OF((zlib_filefunc64_def* pzlib_filefunc_def, LStrHandle *memory));
+LibAPI(MgErr) InitializeFileFuncs OF((LStrHandle filefunc_def));
+LibAPI(MgErr) InitializeStreamFuncs OF((LStrHandle filefunc_def, LStrHandle *memory));
#ifdef __cplusplus
}
Modified: trunk/lvzip/c_source/zalias.h
===================================================================
--- trunk/lvzip/c_source/zalias.h 2012-07-23 21:23:01 UTC (rev 1483)
+++ trunk/lvzip/c_source/zalias.h 2012-07-23 21:26:16 UTC (rev 1484)
@@ -1,144 +1,86 @@
-#define _dist_code lvzip__dist_code
-#define _length_code lvzip__length_code
-#define _tr_align lvzip__tr_align
-#define _tr_flush_block lvzip__tr_flush_block
-#define _tr_init lvzip__tr_init
-#define _tr_stored_block lvzip__tr_stored_block
-#define _tr_tally lvzip__tr_tally
-#define adler32 lvzip_adler32
-#define adler32_combine lvzip_adler32_combine
-#define adler32_combine64 lvzip_adler32_combine64
-#define compress lvzip_compress
-#define compress2 lvzip_compress2
-#define compressBound lvzip_compressBound
-#define crc32 lvzip_crc32
-#define crc32_combine lvzip_crc32_combine
-#define crc32_combine64 lvzip_crc32_combine64
-#define deflate lvzip_deflate
-#define deflate_copyright lvzip_deflate_copyright
-#define deflateBound lvzip_deflateBound
-#define deflateCopy lvzip_deflateCopy
-#define deflateEnd lvzip_deflateEnd
-#define deflateInit_ lvzip_deflateInit_
-#define deflateInit2_ lvzip_deflateInit2_
-#define deflateParams lvzip_deflateParams
-#define deflatePending lvzip_deflatePending
-#define deflatePrime lvzip_deflatePrime
-#define deflateReset lvzip_deflateReset
-#define deflateResetKeep lvzip_deflateResetKeep
-#define deflateSetDictionary lvzip_deflateSetDictionary
-#define deflateSetHeader lvzip_deflateSetHeader
-#define deflateTune lvzip_deflateTune
-#define get_crc_table lvzip_get_crc_table
-#define inflate lvzip_inflate
-#define inflate_copyright lvzip_inflate_copyright
-#define inflate_table lvzip_inflate_table
-#define inflateBack lvzip_inflateBack
-#define inflateBackEnd lvzip_inflateBackEnd
-#define inflateBackInit_ lvzip_inflateBackInit_
-#define inflateCopy lvzip_inflateCopy
-#define inflateEnd lvzip_inflateEnd
-#define inflateGetHeader lvzip_inflateGetHeader
-#define inflate_fast lvzip_inflate_fast
-#define inflateInit_ lvzip_inflateInit_
-#define inflateInit2_ lvzip_inflateInit2_
-#define inflateMark lvzip_inflateMark
-#define inflatePrime lvzip_inflatePrime
-#define inflateReset lvzip_inflateReset
-#define inflateReset2 lvzip_inflateReset2
-#define inflateResetKeep lvzip_inflateResetKeep
-#define inflateSetDictionary lvzip_inflateSetDictionary
-#define inflateSync lvzip_inflateSync
-#define inflateSyncPoint lvzip_inflateSyncPoint
-#define inflateUndermine lvzip_inflateUndermine
-#define uncompress lvzip_uncompress
-#define z_errmsg lvzip_z_errmsg
-#define zcalloc lvzip_zcalloc
-#define zcfree lvzip_zcfree
-#define zError lvzip_zError
-#define zlibCompileFlags lvzip_zlibCompileFlags
-#define zlibVersion lvzip_zlibVersion
-#define unzClose lvzip_unzClose
-#define unzCloseCurrentFile lvzip_unzCloseCurrentFile
-#define unzGetCurrentFileInfo lvzip_unzGetCurrentFileInfo
-#define unzGetCurrentFileInfo64 lvzip_unzGetCurrentFileInfo64
-#define unzGetCurrentFileZStreamPos64 lvzip_unzGetCurrentFileZStreamPos64
-#define unzGetFilePos lvzip_unzGetFilePos
-#define unzGetFilePos64 lvzip_unzGetFilePos64
-#define unzGetGlobalComment lvzip_unzGetGlobalComment
-#define unzGetGlobalInfo lvzip_unzGetGlobalInfo
-#define unzGetGlobalInfo64 lvzip_unzGetGlobalInfo64
-#define unzGetLocalExtrafield lvzip_unzGetLocalExtrafield
-#define unzGetOffset lvzip_unzGetOffset
-#define unzGetOffset64 lvzip_unzGetOffset64
-#define unzGoToFilePos lvzip_unzGoToFilePos
-#define unzGoToFilePos64 lvzip_unzGoToFilePos64
-#define unzGoToFirstFile lvzip_unzGoToFirstFile
-#define unzGoToNextFile lvzip_unzGoToNextFile
-#define unzLocateFile lvzip_unzLocateFile
-#define unzOpen lvzip_unzOpen
-#define unzOpen64 lvzip_unzOpen64
-#define unzOpen2 lvzip_unzOpen2
-#define unzOpen2_64 lvzip_unzOpen2_64
-#define unzOpenCurrentFile lvzip_unzOpenCurrentFile
-#define unzOpenCurrentFile2 lvzip_unzOpenCurrentFile2
-#define unzOpenCurrentFile3 lvzip_unzOpenCurrentFile3
-#define unzOpenCurrentFilePassword lvzip_unzOpenCurrentFilePassword
-#define unzReadCurrentFile lvzip_unzReadCurrentFile
-#define unzRepair lvzip_unzRepair
-#define unzSetOffset lvzip_unzSetOffset
-#define unzSetOffset64 lvzip_unzSetOffset64
-#define unzStringFileNameCompare lvzip_unzStringFileNameCompare
-#define unztell lvzip_unztell
-#define unztell64 lvzip_unztell64
-#define unzeof lvzip_unzeof
-#define zipClose lvzip_zipClose
-#define zipClose2 lvzip_zipClose2
-#define zipCloseFileInZip lvzip_zipCloseFileInZip
-#define zipCloseFileInZipRaw lvzip_zipCloseFileInZipRaw
-#define zipCloseFileInZipRaw64 lvzip_zipCloseFileInZipRaw64
-#define zipOpen lvzip_zipOpen
-#define zipOpen64 lvzip_zipOpen64
-#define zipOpen2 lvzip_zipOpen2
-#define zipOpen2_64 lvzip_zipOpen2_64
-#define zipOpen3 lvzip_zipOpen3
-#define zipOpenNewFileInZip lvzip_zipOpenNewFileInZip
-#define zipOpenNewFileInZip64 lvzip_zipOpenNewFileInZip64
-#define zipOpenNewFileInZip2 lvzip_zipOpenNewFileInZip2
-#define zipOpenNewFileInZip2_64 lvzip_zipOpenNewFileInZip2_64
-#define zipOpenNewFileInZip3 lvzip_zipOpenNewFileInZip3
-#define zipOpenNewFileInZip3_64 lvzip_zipOpenNewFileInZip3_64
-#define zipOpenNewFileInZip4 lvzip_zipOpenNewFileInZip4
-#define zipOpenNewFileInZip4_64 lvzip_zipOpenNewFileInZip4_64
-#define zipRemoveExtraInfoBlock lvzip_zipRemoveExtraInfoBlock
-#define zipWriteInFileInZip lvzip_zipWriteInFileInZip
-#define gzopen lvzlib_gzopen
-#define gzopen64 lvzlib_gzopen64
-#define gzdopen lvzlib_gzdopen
-#define gzbuffer lvzlib_gzbuffer
-#define gzseek lvzlib_gzseek
-#define gzseek64 lvzlib_gzseek64
-#define gzsetparams lvzlib_gzsetparams
-#define gzread lvzlib_gzread
-#define gzwrite lvzlib_gzwrite
-#define gzprintf lvzlib_gzprintf
-#define gzputc lvzlib_gzputc
-#define gzputs lvzlib_gzputs
-#define gzgetc lvzlib_gzgetc
-#define gzgets lvzlib_gzgets
-#define gzungetc lvzlib_gzungetc
-#define gzrewind lvzlib_gzrewind
-#define gzeof lvzlib_gzeof
-#define gzclearerr lvzlib_gzclearerr
-#define gzflush lvzlib_gzflush
-#define gzdirect lvzlib_gzdirect
-#define gzerror lvzlib_gzerror
-#define gzclose lvzlib_gzclose
-#define gzclose_r lvzlib_gzclose_r
-#define gzclose_w lvzlib_gzclose_w
-#define gztell lvzlib_gztell
-#define gztell64 lvzlib_gztell64
-#define gzoffset lvzlib_gzoffset
-#define gzoffset64 lvzlib_gzoffset64
-#define gcrc32_combine lvzlib_crc32_combine
-#define gcrc32_combine64 lvzlib_crc32_combine64
+#define z_errmsg z_z_errmsg
+
+#define unzClose z_unzClose
+#define unzCloseCurrentFile z_unzCloseCurrentFile
+#define unzGetCurrentFileInfo z_unzGetCurrentFileInfo
+#define unzGetCurrentFileInfo64 z_unzGetCurrentFileInfo64
+#define unzGetCurrentFileZStreamPos64 z_unzGetCurrentFileZStreamPos64
+#define unzGetFilePos z_unzGetFilePos
+#define unzGetFilePos64 z_unzGetFilePos64
+#define unzGetGlobalComment z_unzGetGlobalComment
+#define unzGetGlobalInfo z_unzGetGlobalInfo
+#define unzGetGlobalInfo64 z_unzGetGlobalInfo64
+#define unzGetLocalExtrafield z_unzGetLocalExtrafield
+#define unzGetOffset z_unzGetOffset
+#define unzGetOffset64 z_unzGetOffset64
+#define unzGoToFilePos z_unzGoToFilePos
+#define unzGoToFilePos64 z_unzGoToFilePos64
+#define unzGoToFirstFile z_unzGoToFirstFile
+#define unzGoToNextFile z_unzGoToNextFile
+#define unzLocateFile z_unzLocateFile
+#define unzOpen z_unzOpen
+#define unzOpen64 z_unzOpen64
+#define unzOpen2 z_unzOpen2
+#define unzOpen2_64 z_unzOpen2_64
+#define unzOpenCurrentFile z_unzOpenCurrentFile
+#define unzOpenCurrentFile2 z_unzOpenCurrentFile2
+#define unzOpenCurrentFile3 z_unzOpenCurrentFile3
+#define unzOpenCurrentFilePassword z_unzOpenCurrentFilePassword
+#define unzReadCurrentFile z_unzReadCurrentFile
+#define unzRepair z_unzRepair
+#define unzSetOffset z_unzSetOffset
+#define unzSetOffset64 z_unzSetOffset64
+#define unzStringFileNameCompare z_unzStringFileNameCompare
+#define unztell z_unztell
+#define unztell64 z_unztell64
+#define unzeof z_unzeof
+#define zipClose z_zipClose
+#define zipClose2 z_zipClose2
+#define zipCloseFileInZip z_zipCloseFileInZip
+#define zipCloseFileInZipRaw z_zipCloseFileInZipRaw
+#define zipCloseFileInZipRaw64 z_zipCloseFileInZipRaw64
+#define zipOpen z_zipOpen
+#define zipOpen64 z_zipOpen64
+#define zipOpen2 z_zipOpen2
+#define zipOpen2_64 z_zipOpen2_64
+#define zipOpen3 z_zipOpen3
+#define zipOpenNewFileInZip z_zipOpenNewFileInZip
+#define zipOpenNewFileInZip64 z_zipOpenNewFileInZip64
+#define zipOpenNewFileInZip2 z_zipOpenNewFileInZip2
+#define zipOpenNewFileInZip2_64 z_zipOpenNewFileInZip2_64
+#define zipOpenNewFileInZip3 z_zipOpenNewFileInZip3
+#define zipOpenNewFileInZip3_64 z_zipOpenNewFileInZip3_64
+#define zipOpenNewFileInZip4 z_zipOpenNewFileInZip4
+#define zipOpenNewFileInZip4_64 z_zipOpenNewFileInZip4_64
+#define zipRemoveExtraInfoBlock z_zipRemoveExtraInfoBlock
+#define zipWriteInFileInZip z_zipWriteInFileInZip
+#define gzopen z_gzopen
+#define gzopen64 z_gzopen64
+#define gzdopen z_gzdopen
+#define gzbuffer z_gzbuffer
+#define gzseek z_gzseek
+#define gzseek64 z_gzseek64
+#define gzsetparams z_gzsetparams
+#define gzread z_gzread
+#define gzwrite z_gzwrite
+#define gzprintf z_gzprintf
+#define gzputc z_gzputc
+#define gzputs z_gzputs
+#define gzgetc z_gzgetc
+#define gzgets z_gzgets
+#define gzungetc z_gzungetc
+#define gzrewind z_gzrewind
+#define gzeof z_gzeof
+#define gzclearerr z_gzclearerr
+#define gzflush z_gzflush
+#define gzdirect z_gzdirect
+#define gzerror z_gzerror
+#define gzclose z_gzclose
+#define gzclose_r z_gzclose_r
+#define gzclose_w z_gzclose_w
+#define gztell z_gztell
+#define gztell64 z_gztell64
+#define gzoffset z_gzoffset
+#define gzoffset64 z_gzoffset64
+#define gcrc32_combine z_crc32_combine
+#define gcrc32_combine64 z_crc32_combine64
Modified: trunk/lvzip/c_source/zip.h
===================================================================
--- trunk/lvzip/c_source/zip.h 2012-07-23 21:23:01 UTC (rev 1483)
+++ trunk/lvzip/c_source/zip.h 2012-07-23 21:26:16 UTC (rev 1484)
@@ -335,6 +335,9 @@
/*
Close the zipfile
*/
+ZEXTERN int ZEXPORT zipClose2 OF((zipFile file,
+ const char* global_comment,
+ voidp output));
ZEXTERN int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
Modified: trunk/lvzip/c_source/zlibvc.vcproj
===================================================================
--- trunk/lvzip/c_source/zlibvc.vcproj 2012-07-23 21:23:01 UTC (rev 1483)
+++ trunk/lvzip/c_source/zlibvc.vcproj 2012-07-23 21:26:16 UTC (rev 1484)
@@ -382,7 +382,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;_DEBUG;Z_PREFIX;NO_vsnprintf;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="3"
PrecompiledHeaderFile="$(IntDir)\zlibvc.pch"
AssemblerListingLocation="$(IntDir)\"
@@ -481,7 +481,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;_DEBUG;Z_PREFIX;NO_vsnprintf;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="3"
PrecompiledHeaderFile="$(IntDir)\zlibvc.pch"
AssemblerListingLocation="$(IntDir)\"
@@ -1110,7 +1110,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;NDEBUG;Z_PREFIX;NO_vsnprintf;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -1207,7 +1207,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;NDEBUG;Z_PREFIX;NO_vsnprintf;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -2571,6 +2571,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath=".\lvapi.c"
+ >
+ </File>
+ <File
RelativePath="lvutil.c"
>
<FileConfiguration
@@ -2687,18 +2691,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="lvzlib.def"
- >
- <FileConfiguration
- Name="DLL Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="MacBinaryIII.c"
>
<FileConfiguration
@@ -3409,6 +3401,122 @@
</FileConfiguration>
</File>
<File
+ RelativePath="zlib.rc"
+ >
+ <FileConfiguration
+ Name="DLL ASM Obj Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL ASM Obj Release|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="static Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="static Release|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Debug|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Debug|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL ASM Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL ASM Release|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="static ASM Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="static ASM Release|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL ASM Debug|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL ASM Debug|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Release|Win32"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DLL Release|x64"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="zutil.c"
>
<FileConfiguration
@@ -3542,6 +3650,10 @@
>
</File>
<File
+ RelativePath=".\gzguts.h"
+ >
+ </File>
+ <File
RelativePath="inffast.h"
>
</File>
@@ -3618,122 +3730,6 @@
RelativePath="lvzlib.ico"
>
</File>
- <File
- RelativePath="zlib.rc"
- >
- <FileConfiguration
- Name="DLL ASM Obj Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL ASM Obj Release|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="static Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="static Release|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Debug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL ASM Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL ASM Release|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="static ASM Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="static ASM Release|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL ASM Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL ASM Debug|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="DLL Release|x64"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
</Filter>
<Filter
Name="Assembler Files"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2012-07-23 21:23:09
|
Revision: 1483
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1483&view=rev
Author: labviewer
Date: 2012-07-23 21:23:01 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi
trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
trunk/lvzip/source/lvzip.llb/ZLIB Compress Files.vi
trunk/lvzip/source/lvzip.llb/ZLIB Copy Raw File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents Old.vi
trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi
trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
trunk/lvzip/source/lvzip.llb/ZLIB Extract.vi
trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info Old.vi
trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
trunk/lvzip/source/lvzip.llb/ZLIB Get Version.vi
trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi
trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi
trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi
trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
trunk/lvzip/source/lvzip.llb/ZLIB Store.vi
trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
trunk/lvzip/source/lvzip.llb/ZLIB VI Tree.vi
trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
trunk/lvzip/source/lvzlib.dll
trunk/lvzip/source/lvzlib.framework.zip
trunk/lvzip/source/lvzlib.so
Added Paths:
-----------
trunk/lvzip/source/64Bit/
trunk/lvzip/source/64Bit/lvzlib.dll
Removed Paths:
-------------
trunk/lvzip/source/64Bit/lvzlib.dll
Deleted: trunk/lvzip/source/64Bit/lvzlib.dll
===================================================================
(Binary files differ)
Copied: trunk/lvzip/source/64Bit/lvzlib.dll (from rev 1480, trunk/lvzip/source/Win64/lvzlib.dll)
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB CRC32.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Read File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Unzip Archive.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Write File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Compress Files.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Copy Raw File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Deflate.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents Old.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Enumerate File Contents.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract All Files To Dir.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Extract.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB File Information.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info Old.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Current File Info.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Global Info.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Get Version.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To First File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Go To Next File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Inflate.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize File Functions.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Locate File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Move Raw File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Read File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Archive.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Unzip.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Write File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Archive.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Open Zip.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Compressed Stream.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Read Local Extra Data.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store Stream.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Store.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Transfer Raw File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB VI Tree.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write File.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Write Stream.vi
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzlib.dll
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzlib.framework.zip
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzlib.so
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2012-07-17 16:01:00
|
Revision: 1482
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1482&view=rev
Author: labviewer
Date: 2012-07-17 16:00:51 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
remove binary file from SC
Removed Paths:
-------------
trunk/lvzip/c_source/zlibvc.suo
Deleted: trunk/lvzip/c_source/zlibvc.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2012-07-17 15:57:43
|
Revision: 1481
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1481&view=rev
Author: labviewer
Date: 2012-07-17 15:57:32 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Fix a problem with support for Windows 64 bit
Modified Paths:
--------------
trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi
Modified: trunk/lvzip/source/lvzip.llb/ZLIB Common Path to Specific Path.vi
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lab...@us...> - 2012-07-16 09:10:42
|
Revision: 1480
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1480&view=rev
Author: labviewer
Date: 2012-07-16 09:10:35 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
Update to zlib 1.2.7
Modified Paths:
--------------
trunk/lvzip/c_source/Makefile
trunk/lvzip/c_source/gzread.c
trunk/lvzip/c_source/zalias.h
trunk/lvzip/c_source/zlib.h
trunk/lvzip/c_source/zlibvc.suo
trunk/lvzip/c_source/zlibvc.vcproj
trunk/lvzip/source/Win64/lvzlib.dll
trunk/lvzip/source/lvzlib.dll
trunk/lvzip/source/lvzlib.so
Modified: trunk/lvzip/c_source/Makefile
===================================================================
--- trunk/lvzip/c_source/Makefile 2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/Makefile 2012-07-16 09:10:35 UTC (rev 1480)
@@ -32,7 +32,7 @@
CPP=gcc -E
STATICLIB=lvzlib.a
-SHAREDLIB=lvzlib.so.2
+SHAREDLIB=lvzlib.so.1
SHAREDLIBV=lvzlib.so
SHAREDLIBM=
LIBS=$(STATICLIB) $(SHAREDLIBV)
@@ -41,7 +41,7 @@
ARFLAGS=rc
RANLIB=ranlib
LDCONFIG=ldconfig
-LDSHAREDLIBC=-lc -llv
+LDSHAREDLIBC=-lc
TAR=tar
SHELL=/bin/sh
EXE=
@@ -57,12 +57,12 @@
OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
-OBJL = lvutil.o ioapi.o iomem.o mztools.o
+OBJL = unzip.o zip.o lvutil.o ioapi.o iomem.o mztools.o
OBJC = $(OBJZ) $(OBJL) $(OBJG)
PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
-PIC_OBJL = lvutil.lo ioapi.lo iomem.lo mztools.lo
+PIC_OBJL = unzip.lo zip.lo lvutil.lo ioapi.lo iomem.lo mztools.lo
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJL) $(PIC_OBJG)
# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
Modified: trunk/lvzip/c_source/gzread.c
===================================================================
--- trunk/lvzip/c_source/gzread.c 2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/gzread.c 2012-07-16 09:10:35 UTC (rev 1480)
@@ -378,7 +378,7 @@
}
/* -- see zlib.h -- */
-#undef gzgetc
+//#undef gzgetc
int ZEXPORT gzgetc(file)
gzFile file;
{
@@ -408,11 +408,13 @@
return ret < 1 ? -1 : buf[0];
}
+#if 0
int ZEXPORT gzgetc_(file)
gzFile file;
{
return gzgetc(file);
}
+#endif
/* -- see zlib.h -- */
int ZEXPORT gzungetc(c, file)
Modified: trunk/lvzip/c_source/zalias.h
===================================================================
--- trunk/lvzip/c_source/zalias.h 2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/zalias.h 2012-07-16 09:10:35 UTC (rev 1480)
@@ -110,11 +110,35 @@
#define zipOpenNewFileInZip3_64 lvzip_zipOpenNewFileInZip3_64
#define zipOpenNewFileInZip4 lvzip_zipOpenNewFileInZip4
#define zipOpenNewFileInZip4_64 lvzip_zipOpenNewFileInZip4_64
-#define zipRemoveExtraInfoBlock lvzip_RemoveExtraInfoBlock
+#define zipRemoveExtraInfoBlock lvzip_zipRemoveExtraInfoBlock
#define zipWriteInFileInZip lvzip_zipWriteInFileInZip
-#define gzopen lvzip_gzopen
-#define gzseek lvzip_gzseek
-#define gztell lvzip_gztell
-#define gzoffset lvzip_gzoffset
-#define adler32_combine lvzip_adler32_combine
-#define gcrc32_combine lvzip_crc32_combine
+#define gzopen lvzlib_gzopen
+#define gzopen64 lvzlib_gzopen64
+#define gzdopen lvzlib_gzdopen
+#define gzbuffer lvzlib_gzbuffer
+#define gzseek lvzlib_gzseek
+#define gzseek64 lvzlib_gzseek64
+#define gzsetparams lvzlib_gzsetparams
+#define gzread lvzlib_gzread
+#define gzwrite lvzlib_gzwrite
+#define gzprintf lvzlib_gzprintf
+#define gzputc lvzlib_gzputc
+#define gzputs lvzlib_gzputs
+#define gzgetc lvzlib_gzgetc
+#define gzgets lvzlib_gzgets
+#define gzungetc lvzlib_gzungetc
+#define gzrewind lvzlib_gzrewind
+#define gzeof lvzlib_gzeof
+#define gzclearerr lvzlib_gzclearerr
+#define gzflush lvzlib_gzflush
+#define gzdirect lvzlib_gzdirect
+#define gzerror lvzlib_gzerror
+#define gzclose lvzlib_gzclose
+#define gzclose_r lvzlib_gzclose_r
+#define gzclose_w lvzlib_gzclose_w
+#define gztell lvzlib_gztell
+#define gztell64 lvzlib_gztell64
+#define gzoffset lvzlib_gzoffset
+#define gzoffset64 lvzlib_gzoffset64
+#define gcrc32_combine lvzlib_crc32_combine
+#define gcrc32_combine64 lvzlib_crc32_combine64
Modified: trunk/lvzip/c_source/zlib.h
===================================================================
--- trunk/lvzip/c_source/zlib.h 2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/zlib.h 2012-07-16 09:10:35 UTC (rev 1480)
@@ -1656,6 +1656,7 @@
unsigned char *next;
z_off64_t pos;
};
+#if 0
ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */
#ifdef Z_PREFIX_SET
# undef z_gzgetc
@@ -1665,6 +1666,7 @@
# define gzgetc(g) \
((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
#endif
+#endif
/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
* change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
Modified: trunk/lvzip/c_source/zlibvc.suo
===================================================================
(Binary files differ)
Modified: trunk/lvzip/c_source/zlibvc.vcproj
===================================================================
--- trunk/lvzip/c_source/zlibvc.vcproj 2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/zlibvc.vcproj 2012-07-16 09:10:35 UTC (rev 1480)
@@ -351,8 +351,8 @@
</Configuration>
<Configuration
Name="DLL Debug|Win32"
- OutputDirectory=".\zlibvc___Win32_DLL_Debug"
- IntermediateDirectory=".\zlibvc___Win32_DLL_Debug"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
@@ -382,12 +382,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL"
+ PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="3"
- PrecompiledHeaderFile=".\zlibvc___Win32_DLL_Debug/zlibvc.pch"
- AssemblerListingLocation=".\zlibvc___Win32_DLL_Debug/"
- ObjectFile=".\zlibvc___Win32_DLL_Debug/"
- ProgramDataBaseFileName=".\zlibvc___Win32_DLL_Debug/"
+ PrecompiledHeaderFile="$(IntDir)\zlibvc.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
@@ -400,7 +400,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="WIN32,_DEBUG"
Culture="1033"
- ResourceOutputFileName="zlibvc___Win32_DLL_Debug\lvzlib.res"
+ ResourceOutputFileName="$(IntDir)\lvzlib.res"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -409,16 +409,16 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="labviewv.lib"
- OutputFile="zlibvc___Win32_DLL_Debug\lvzlib.dll"
+ OutputFile="$(IntDir)\\lvzlib.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../cintools"
IgnoreDefaultLibraryNames="msvcrt"
- ModuleDefinitionFile=".\lvzlib.def"
+ ModuleDefinitionFile=""
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\zlibvc___Win32_DLL_Debug/lvzlib.pdb"
+ ProgramDatabaseFile="$(IntDir)\lvzlib.pdb"
SubSystem="2"
- ImportLibrary=".\zlibvc___Win32_DLL_Debug/lvzlib.lib"
+ ImportLibrary="$(IntDir)\lvzlib.lib"
TargetMachine="1"
/>
<Tool
@@ -433,7 +433,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\zlibvc___Win32_DLL_Debug/zlibvc.bsc"
+ OutputFile="$(IntDir)\zlibvc.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -481,12 +481,12 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL"
+ PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="3"
- PrecompiledHeaderFile=".\zlibvc___Win32_DLL_Debug/zlibvc.pch"
- AssemblerListingLocation=".\zlibvc___Win32_DLL_Debug/"
- ObjectFile=".\zlibvc___Win32_DLL_Debug/"
- ProgramDataBaseFileName=".\zlibvc___Win32_DLL_Debug/"
+ PrecompiledHeaderFile="$(IntDir)\zlibvc.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
@@ -499,7 +499,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="WIN32,_DEBUG"
Culture="1033"
- ResourceOutputFileName="zlibvc___Win32_DLL_Debug\lvzlib.res"
+ ResourceOutputFileName="$(IntDir)\lvzlib.res"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -508,16 +508,16 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="labview64.lib"
- OutputFile="zlibvc___Win32_DLL_Debug\lvzlib.dll"
+ OutputFile="$(IntDir)\\lvzlib.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../cintools"
IgnoreDefaultLibraryNames="msvcrt"
ModuleDefinitionFile=""
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\zlibvc___Win32_DLL_Debug/lvzlib.pdb"
+ ProgramDatabaseFile="$(IntDir)\lvzlib.pdb"
SubSystem="2"
- ImportLibrary=".\zlibvc___Win32_DLL_Debug/lvzlib.lib"
+ ImportLibrary="$(IntDir)\lvzlib.lib"
TargetMachine="17"
/>
<Tool
@@ -532,7 +532,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\zlibvc___Win32_DLL_Debug/zlibvc.bsc"
+ OutputFile="$(IntDir)\zlibvc.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -1110,9 +1110,9 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=""
AssemblerListingLocation="$(IntDir)\"
@@ -1141,7 +1141,7 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="../../cintools"
- ModuleDefinitionFile=".\lvzlib.def"
+ ModuleDefinitionFile=""
SubSystem="2"
ImportLibrary="$(OutDir)/lvzlib.lib"
TargetMachine="1"
@@ -1207,9 +1207,9 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL"
+ PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=""
AssemblerListingLocation="$(IntDir)\"
Modified: trunk/lvzip/source/Win64/lvzlib.dll
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzlib.dll
===================================================================
(Binary files differ)
Modified: trunk/lvzip/source/lvzlib.so
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-12-20 04:49:31
|
Revision: 1474
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1474&view=rev
Author: jgcode
Date: 2011-12-20 04:49:26 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Added palette image
Added Paths:
-----------
trunk/labpython/source/images/palette.png
Added: trunk/labpython/source/images/palette.png
===================================================================
(Binary files differ)
Property changes on: trunk/labpython/source/images/palette.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-12-13 10:40:13
|
Revision: 1472
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1472&view=rev
Author: jgcode
Date: 2011-12-13 10:40:06 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
This document contains items that need to be addressed for the next release of LVZIP.
Added Paths:
-----------
trunk/lvzip/developer docs/ToDo.txt
Added: trunk/lvzip/developer docs/ToDo.txt
===================================================================
--- trunk/lvzip/developer docs/ToDo.txt (rev 0)
+++ trunk/lvzip/developer docs/ToDo.txt 2011-12-13 10:40:06 UTC (rev 1472)
@@ -0,0 +1,26 @@
+The last release (version 4.0.0-2) of LVZIP was 'massaged' in that the package was edited to work with VIPM 2010+ and the OpenG 4.x release.
+
+No code was changed, the package was simply unzipped, a few non-VI files (build spec, .mnu) edited and then the package was re-zipped.
+
+All OpenG projects (except those massaged) were upgraded to VIPM 2010+ which used the Custom Category feature of VIPM and this meant the Top Level palette was relocated. The menu location and name was changed as this was important for alphabetical ordering in the OpenG Palette.
+
+Also the package was made to display a proper name in VIPM: "OpenG LabVIEW ZIP Library" instead of "oglib_lvzip"
+
+********************
+START CHANGES
+********************
+Therefore, the following items need to be addressed for LabVIEW 2009+ installations:
+- Functions Palette Name: functions_oglib_lvzip.mnu
+- Palette Installation location: <menus>\Categories\OpenG
+
+Additionally
+- Built Spec File should contain the following name|value pair under the section "[Package Name]":
+ Display Name="OpenG LabVIEW ZIP Library"
+ This will ensure that the name is correctly displayed in VIPM 2010+
+
+Additionally the following needs to be addressed:
+- All scripts cannot be dependent on any non-LabVIEW VIs otherwise an error 'may' occur. See the thread "Order of Installed Dependencies Affect Installation When Package Uses Scripts" for more information (which includes a workaround):
+ http://forums.jki.net/topic/1643-order-of-installed-dependencies-affect-installation-when-package-uses-scripts/
+********************
+END CHANGES
+********************
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-12-13 07:04:42
|
Revision: 1471
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1471&view=rev
Author: jgcode
Date: 2011-12-13 07:04:32 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Updated .LVPROJ file and added palette.png image.
Modified Paths:
--------------
trunk/string/string.lvproj
Added Paths:
-----------
trunk/string/source/images/palette.png
Added: trunk/string/source/images/palette.png
===================================================================
(Binary files differ)
Property changes on: trunk/string/source/images/palette.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/string/string.lvproj
===================================================================
--- trunk/string/string.lvproj 2011-12-13 06:33:18 UTC (rev 1470)
+++ trunk/string/string.lvproj 2011-12-13 07:04:32 UTC (rev 1471)
@@ -22,21 +22,9 @@
<Item Name="CSV String to Array.vi" Type="VI" URL="../candidates/CSV String to Array.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
- <Item Name="Is a GUID.vi" Type="VI" URL="../candidates/Is a GUID.vi">
- <Property Name="marked" Type="Int">0</Property>
- </Item>
- <Item Name="Is an MD5.vi" Type="VI" URL="../candidates/Is an MD5.vi">
- <Property Name="marked" Type="Int">0</Property>
- </Item>
<Item Name="TEST - CSV String to Array.vi" Type="VI" URL="../candidates/TEST - CSV String to Array.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
- <Item Name="TEST - Is a GUID.vi" Type="VI" URL="../candidates/TEST - Is a GUID.vi">
- <Property Name="marked" Type="Int">0</Property>
- </Item>
- <Item Name="TEST - Is an MD5.vi" Type="VI" URL="../candidates/TEST - Is an MD5.vi">
- <Property Name="marked" Type="Int">0</Property>
- </Item>
</Item>
<Item Name="dev docs" Type="Folder">
<Item Name="ToDo.txt" Type="Document" URL="../dev docs/ToDo.txt"/>
@@ -45,6 +33,7 @@
<Item Name="examples" Type="Folder"/>
<Item Name="images" Type="Folder">
<Item Name="icon.png" Type="Document" URL="../source/images/icon.png"/>
+ <Item Name="palette.png" Type="Document" URL="../source/images/palette.png"/>
</Item>
<Item Name="library" Type="Folder">
<Item Name="Convert EOLs" Type="Folder">
@@ -100,16 +89,17 @@
<Item Name="Place Number to Proper Engl Text.vi" Type="VI" URL="../source/library/Place Number to Proper Engl Text.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
+ <Item Name="Resolve Timestamp Format.vi" Type="VI" URL="../source/library/Resolve Timestamp Format.vi"/>
<Item Name="Scan Variant from String.vi" Type="VI" URL="../source/library/Scan Variant from String.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
<Item Name="Search or Split String.vi" Type="VI" URL="../source/library/Search or Split String.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
- <Item Name="Slice String.vi" Type="VI" URL="../source/library/Slice String.vi">
+ <Item Name="Slice String 1.vi" Type="VI" URL="../source/library/Slice String 1.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
- <Item Name="Slice String 1.vi" Type="VI" URL="../source/library/Slice String 1.vi">
+ <Item Name="Slice String.vi" Type="VI" URL="../source/library/Slice String.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
<Item Name="String to 1D Array.vi" Type="VI" URL="../source/library/String to 1D Array.vi">
@@ -144,6 +134,11 @@
<Item Name=".vipc" Type="Document" URL="../source/.vipc"/>
</Item>
<Item Name="tests" Type="Folder">
+ <Item Name="support" Type="Folder">
+ <Item Name="Format Variant Into String.txt" Type="Document" URL="../tests/support/Format Variant Into String.txt"/>
+ <Item Name="Setup - Forrmat Variant Into String.vi" Type="VI" URL="../tests/support/Setup - Forrmat Variant Into String.vi"/>
+ <Item Name="Teardown - Forrmat Variant Into String.vi" Type="VI" URL="../tests/support/Teardown - Forrmat Variant Into String.vi"/>
+ </Item>
<Item Name="TEST - 1D Array to String.vi" Type="VI" URL="../tests/TEST - 1D Array to String.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
@@ -162,12 +157,14 @@
<Item Name="TEST - Place Number to Proper Engl Text.vi" Type="VI" URL="../tests/TEST - Place Number to Proper Engl Text.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
+ <Item Name="TEST - Resolve Timestamp Format.vi" Type="VI" URL="../tests/TEST - Resolve Timestamp Format.vi"/>
<Item Name="TEST - Scan Variant from String.vi" Type="VI" URL="../tests/TEST - Scan Variant from String.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
<Item Name="TEST - Search or Split String.vi" Type="VI" URL="../tests/TEST - Search or Split String.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
+ <Item Name="TEST - Slice String 1.vi" Type="VI" URL="../tests/TEST - Slice String 1.vi"/>
<Item Name="TEST - Slice String.vi" Type="VI" URL="../tests/TEST - Slice String.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
@@ -506,6 +503,7 @@
<Item Name="Waveform Subtype Enum__ogtk.ctl" Type="VI" URL="/<userlib>/_OpenG.lib/lvdata/lvdata.llb/Waveform Subtype Enum__ogtk.ctl"/>
<Item Name="Get Waveform Type Enum from TD__ogtk.vi" Type="VI" URL="/<userlib>/_OpenG.lib/lvdata/lvdata.llb/Get Waveform Type Enum from TD__ogtk.vi"/>
<Item Name="Get Variant Attributes__ogtk.vi" Type="VI" URL="/<userlib>/_OpenG.lib/lvdata/lvdata.llb/Get Variant Attributes__ogtk.vi"/>
+ <Item Name="Current VI's Path__ogtk.vi" Type="VI" URL="/<userlib>/_OpenG.lib/file/file.llb/Current VI's Path__ogtk.vi"/>
</Item>
<Item Name="vi.lib" Type="Folder">
<Item Name="Merge Errors.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Merge Errors.vi">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-12-13 06:33:25
|
Revision: 1470
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1470&view=rev
Author: jgcode
Date: 2011-12-13 06:33:18 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Finished implementing additional datatype support for Format Variant Into String.vi and Scan Variant from String.vi. Updated .VIPB file for build v4.1.0.12.
TrackerID: 3303663
Modified Paths:
--------------
trunk/string/source/.vipb
trunk/string/source/.vipc
trunk/string/source/library/Format Variant Into String.vi
trunk/string/source/library/Scan Variant from String.vi
trunk/string/source/user docs/License Agreement.txt
trunk/string/tests/TEST - Format Variant Into String.vi
trunk/string/tests/TEST - Scan Variant from String.vi
Added Paths:
-----------
trunk/string/source/library/Resolve Timestamp Format.vi
trunk/string/tests/TEST - Resolve Timestamp Format.vi
trunk/string/tests/support/
trunk/string/tests/support/Format Variant Into String.txt
trunk/string/tests/support/Setup - Forrmat Variant Into String.vi
trunk/string/tests/support/Teardown - Forrmat Variant Into String.vi
Modified: trunk/string/source/.vipb
===================================================================
--- trunk/string/source/.vipb 2011-11-22 04:39:04 UTC (rev 1469)
+++ trunk/string/source/.vipb 2011-12-13 06:33:18 UTC (rev 1470)
@@ -1,13 +1,13 @@
-<VI_Package_Builder_Settings Version="0.3" Created_Date="2010-12-07 17:22:49" Modified_Date="2011-10-07 02:27:00" Creator="Jonathon Green" Comments="" ID="9f6b30d237d91d8420dbfa7a2ea1204c">
+<VI_Package_Builder_Settings Version="0.3" Created_Date="2010-12-07 17:22:49" Modified_Date="2011-12-13 14:30:51" Creator="Jonathon Green" Comments="" ID="4c281d383bac75c0fd1d56a228e22ed3">
<Library_General_Settings>
<Package_File_Name>oglib_string</Package_File_Name>
- <Library_Version>4.1.0.9</Library_Version>
+ <Library_Version>4.1.0.13</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>..</Library_Output_Folder>
<Company_Name>OpenG.org</Company_Name>
<Library_Summary/>
- <Library_License>BSD</Library_License>
+ <Library_License>BSD-3-Clause</Library_License>
<Package_LabVIEW_Version>9.0</Package_LabVIEW_Version>
<Community_Edition>false</Community_Edition>
<Package_Icon>00000D7E002800000C9A00000400000200020022002200080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA000088888888888800007777777777770000555555555555000044444444444400002222222222220000111111111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E000000000000000000001E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E000000000000000000001E1E2525252525252525252525252525252525251E1E000000000000000000001E1E2525252525252525252525252525252525251E1E000000000000000000001E1E25252525252525FF252525252525252525251E1E000000000000000000001E1E25252525252525FF252525252525252525251E1E000000000000000000001E1E252525FFFFFF25FFFFFF252525FFFFFF25251E1E000000000000000000001E1E2525FF2525FF25FF2525FF25FF25252525251E1E000000000000000000001E1E2525FF2525FF25FF2525FF25FF25252525251E1E000000000000000000001E1E252525FFFFFF25FFFFFF252525FFFFFF25251E1E000000000000000000001E1E2525252525252525252525252525252525251E1E000000000000000000001E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E000000000000000000001E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E1E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000FF252525252525252525252525252525252525FF00000000000000000000000000FF2525252525252525252525FFFFFFFF252525FF000000000000000000000000FF25252525252525252525FFFF2525FFFF2525FF000000000000000000000000FF2525FFFFFF2525252525FFFF2525FFFF2525FF000000000000000000000000FF25252525FFFF25252525FFFFFFFFFFFF2525FF000000000000000000000000FF2525FFFFFFFF25252525FFFF2525FFFF2525FF000000000000000000000000FF25FFFF25FFFF25252525FFFF2525FFFF2525FF000000000000000000000000FF2525FFFFFFFFFF252525FFFF2525FFFF2525FF0000000000000000000000FF252525252525252525252525252525252525FF0000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007FFFFE007FFFFE007FFFFE007FFFFE007FFFFE007FFFFE007FFFFE007FFFFE007FFFFE007FFFFE007FFFFE007FFFFE007FFFFE000000000000000000000000000000000000FFFFF0007FFFF8003FFFFC003FFFFC003FFFFC003FFFFC003FFFFC003FFFFC003FFFFC007FFFF800FFFFF00000000000000000002900000012000000020000000D01000000000100000000000A000000080000000000240024002900000012000000020000000D00B2B2B900010000000000100000001000000002002300000000000000000023002900000012000000020000000D00FCFCFD00010000000000100000001000000002002200010001000100010022002900000012000000020000000D00B2B2B900010000000000100000001000000002000000240024002400240000002900000012000000020000000D0080808A00010000000000100000001000000002000100230023002300230001</Package_Icon>
@@ -16,8 +16,10 @@
</Library_General_Settings>
<Advanced_Settings>
<Package_Dependencies>
- <Additional_External_Dependencies>oglib_error >=2.3</Additional_External_Dependencies>
- <Additional_External_Dependencies>oglib_lvdata >=4.1.0.9</Additional_External_Dependencies>
+ <External_Dependencies>oglib_error >= 4.2.0.23</External_Dependencies>
+ <External_Dependencies>oglib_lvdata >= 4.1.0.16</External_Dependencies>
+ <Direct_Dependencies>oglib_error-4.2.0.23</Direct_Dependencies>
+ <Direct_Dependencies>oglib_lvdata-4.1.0.16</Direct_Dependencies>
</Package_Dependencies>
<Custom_Action_VIs>
<Pre-Build_VI>..\build support\Pre-Build VI - Run Unit Tests.vi</Pre-Build_VI>
@@ -31,18 +33,18 @@
<Description>
<One_Line_Description_Summary>OpenG String Library</One_Line_Description_Summary>
<Description>The OpenG String Library package contains several routines for operating on strings.</Description>
- <Copyright>2002-2007 Jim Kring; 2002 Cal-Bay Systems; 2004 Paul Sullivan; 2004 Michael C. Ashe; 2005-2006 MKS Instruments, Inc. (author: Doug Femec); 2010-2011 Jonathon Green; 2011 Shaun Rumbell, 2011 Darin.k; 2011 Wouter Geelen; 2011 Fabiola De la Cueva</Copyright>
+ <Copyright>2002-2007 Jim Kring; 2002 Cal-Bay Systems; 2004 Paul Sullivan; 2004 Michael C. Ashe; 2005-2006 MKS Instruments, Inc. (author: Doug Femec); 2010-2011 Jonathon Green; 2011 Shaun Rumbell; 2011 Darin.K; 2011 Wouter Geelen; 2011 Fabiola De la Cueva; 2011 Phillip Brooks; 2011 Jonas Mellroth; 2011 Ed Dickens</Copyright>
<Packager>OpenG.org</Packager>
<URL>http://wiki.openg.org/Oglib_string</URL>
- <Release_Notes>[FIX] 3303663 - "Format Variant Into String" doesn't handle Timestamp
-[FIX] 3292424 - Update "Trim Whitespace" with "Fast Trim"
-[FIX] 3275381 - "Slice String" has Input or RHS of Connector Pane
+ <Release_Notes>[MOD] 3303663 - Format Variant Into String__ogtk.vi doesn't handle Timestamp
+[MOD] 3292424 - Update Trim Whitespace with Fast Trim
+[FIX] 3275381 - "Slice String__ogtk.vi" has Input or RHS of Connector Pane
[FIX] 1958939 - "Scan Variant from String" missing description
-[FIX] 3275249 - Update "OpenG Comment"
-[FIX] 3386135 - OpenG Comment should be a Merge VI in palette
-[FIX] 1914597 - "Format Variant Into String" missing DAQ, DAQmx, and VISA type
-[FIX] 921506 - "Format Variant Into String" should accept RefNums
-[FIX] 3419755 - Create new String To Character Array VI</Release_Notes>
+[MOD] 3275249 - Update OpenG Comment
+[FIX] 3386135 - OpenG Comment not Merge VI in palette
+[MOD] 1914597 - Format Variant Into String missing DAQ, DAQmx, and VISA type
+[MOD] 921506 - "Format Variant Into String" should accept RefNums
+[NEW] 3419755 - Create new String To Character Array VI</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
Modified: trunk/string/source/.vipc
===================================================================
(Binary files differ)
Modified: trunk/string/source/library/Format Variant Into String.vi
===================================================================
(Binary files differ)
Added: trunk/string/source/library/Resolve Timestamp Format.vi
===================================================================
(Binary files differ)
Property changes on: trunk/string/source/library/Resolve Timestamp Format.vi
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/string/source/library/Scan Variant from String.vi
===================================================================
(Binary files differ)
Modified: trunk/string/source/user docs/License Agreement.txt
===================================================================
--- trunk/string/source/user docs/License Agreement.txt 2011-11-22 04:39:04 UTC (rev 1469)
+++ trunk/string/source/user docs/License Agreement.txt 2011-12-13 06:33:18 UTC (rev 1470)
@@ -1,6 +1,6 @@
OpenG String Library
-2002-2007 Jim Kring; 2002 Cal-Bay Systems; 2004 Paul Sullivan; 2004 Michael C. Ashe; 2005-2006 MKS Instruments, Inc. (author: Doug Femec); 2010-2011 Jonathon Green; 2011 Shaun Rumbell, 2011 Darin.k; 2011 Wouter Geelen; 2011 Fabiola De la Cueva
+2002-2007 Jim Kring; 2002 Cal-Bay Systems; 2004 Paul Sullivan; 2004 Michael C. Ashe; 2005-2006 MKS Instruments, Inc. (author: Doug Femec); 2010-2011 Jonathon Green; 2011 Shaun Rumbell; 2011 Darin.K; 2011 Wouter Geelen; 2011 Fabiola De la Cueva; 2011 Phillip Brooks; 2011 Jonas Mellroth; 2011 Ed Dickens
All rights reserved.
Modified: trunk/string/tests/TEST - Format Variant Into String.vi
===================================================================
(Binary files differ)
Added: trunk/string/tests/TEST - Resolve Timestamp Format.vi
===================================================================
(Binary files differ)
Property changes on: trunk/string/tests/TEST - Resolve Timestamp Format.vi
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/string/tests/TEST - Scan Variant from String.vi
===================================================================
(Binary files differ)
Property changes on: trunk/string/tests/support
___________________________________________________________________
Added: bugtraq:label
+ TrackerID:
Added: bugtraq:url
+ https://sourceforge.net/support/tracker.php?aid=%BUGID%
Added: bugtraq:message
+ TrackerID: %BUGID%
Added: trunk/string/tests/support/Format Variant Into String.txt
===================================================================
--- trunk/string/tests/support/Format Variant Into String.txt (rev 0)
+++ trunk/string/tests/support/Format Variant Into String.txt 2011-12-13 06:33:18 UTC (rev 1470)
@@ -0,0 +1 @@
+The file is used for testing with "TEST - Format Variant In String.vi".
\ No newline at end of file
Added: trunk/string/tests/support/Setup - Forrmat Variant Into String.vi
===================================================================
(Binary files differ)
Property changes on: trunk/string/tests/support/Setup - Forrmat Variant Into String.vi
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/string/tests/support/Teardown - Forrmat Variant Into String.vi
===================================================================
(Binary files differ)
Property changes on: trunk/string/tests/support/Teardown - Forrmat Variant Into String.vi
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-11-22 04:39:10
|
Revision: 1469
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1469&view=rev
Author: jgcode
Date: 2011-11-22 04:39:04 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Bugfix from last checkin - corrected package name field.
Modified Paths:
--------------
trunk/ogedit_file_locate_in_project/source/.vipb
Modified: trunk/ogedit_file_locate_in_project/source/.vipb
===================================================================
--- trunk/ogedit_file_locate_in_project/source/.vipb 2011-11-22 04:34:20 UTC (rev 1468)
+++ trunk/ogedit_file_locate_in_project/source/.vipb 2011-11-22 04:39:04 UTC (rev 1469)
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="0.3" Created_Date="2011-11-22 10:13:14" Modified_Date="2011-11-22 10:56:59" Creator="Jonathon Green" Comments="" ID="e16ea9c1272933d57058f2b4072e39bf">
+<VI_Package_Builder_Settings Version="0.3" Created_Date="2011-11-22 10:13:14" Modified_Date="2011-11-22 12:37:03" Creator="Jonathon Green" Comments="" ID="2f0289d50d06f20d2a4c6fdf680e48ab">
<Library_General_Settings>
- <Package_File_Name>ogrsc_locate_file_in_project</Package_File_Name>
- <Library_Version>4.0.0.7</Library_Version>
+ <Package_File_Name>ogedit_file_locate_in_project</Package_File_Name>
+ <Library_Version>4.0.0.8</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>..</Library_Output_Folder>
@@ -15,9 +15,7 @@
<Was_Built>true</Was_Built>
</Library_General_Settings>
<Advanced_Settings>
- <Package_Dependencies>
- <Package_Conflicts>ogedit_file_locate_in_project >=1.0.0.3</Package_Conflicts>
- </Package_Dependencies>
+ <Package_Dependencies/>
<Custom_Action_VIs>
<Pre-Build_VI/>
<Post-Build_VI/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-11-22 04:34:26
|
Revision: 1468
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1468&view=rev
Author: jgcode
Date: 2011-11-22 04:34:20 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Completed upgrade to LabVIEW 2009 and VIPM 2011. Added workaround for VIPM Bug (http://forums.jki.net/topic/1619-bug-secondary-dependencies-not-included-as-internal-dependencies/). Built for release v4.0.0.15.
Modified Paths:
--------------
trunk/rename_folder_of_vis/rename_folder_of_vis.lvproj
trunk/rename_folder_of_vis/source/.vipb
trunk/rename_folder_of_vis/source/.vipc
trunk/rename_folder_of_vis/source/library/RFOVIs--GetVersion.vi
trunk/rename_folder_of_vis/source/library/Rename_Folder_of_VIs.vi
Added Paths:
-----------
trunk/rename_folder_of_vis/source/library/Dependencies.vi
Modified: trunk/rename_folder_of_vis/rename_folder_of_vis.lvproj
===================================================================
--- trunk/rename_folder_of_vis/rename_folder_of_vis.lvproj 2011-11-22 03:02:24 UTC (rev 1467)
+++ trunk/rename_folder_of_vis/rename_folder_of_vis.lvproj 2011-11-22 04:34:20 UTC (rev 1468)
@@ -24,6 +24,7 @@
<Item Name="Proxy - Dist Set LLB Caching.vi" Type="VI" URL="../source/library/Proxy - Dist Set LLB Caching.vi"/>
<Item Name="RFOVIs--GetVersion.vi" Type="VI" URL="../source/library/RFOVIs--GetVersion.vi"/>
</Item>
+ <Item Name="Dependencies.vi" Type="VI" URL="../source/library/Dependencies.vi"/>
<Item Name="Rename_Folder_of_VIs.vi" Type="VI" URL="../source/library/Rename_Folder_of_VIs.vi"/>
</Item>
</Item>
Modified: trunk/rename_folder_of_vis/source/.vipb
===================================================================
--- trunk/rename_folder_of_vis/source/.vipb 2011-11-22 03:02:24 UTC (rev 1467)
+++ trunk/rename_folder_of_vis/source/.vipb 2011-11-22 04:34:20 UTC (rev 1468)
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="0.3" Created_Date="2011-10-09 10:01:59" Modified_Date="2011-10-09 10:24:03" Creator="Jonathon Green" Comments="" ID="7ec4182d4385f3bc0c1832bf19b2ca65">
+<VI_Package_Builder_Settings Version="0.3" Created_Date="2011-10-09 10:01:59" Modified_Date="2011-11-22 12:27:14" Creator="Jonathon Green" Comments="" ID="b2b582f739cb9bf89613170de9fda0a4">
<Library_General_Settings>
<Package_File_Name>ogrsc_rename_folder_of_vis</Package_File_Name>
- <Library_Version>4.0.0.6</Library_Version>
+ <Library_Version>4.0.0.16</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>..</Library_Output_Folder>
@@ -17,9 +17,11 @@
<Advanced_Settings>
<Package_Dependencies>
<Direct_Dependencies>oglib_appcontrol-4.1.0.7</Direct_Dependencies>
+ <Direct_Dependencies>oglib_array-4.1.0.13</Direct_Dependencies>
<Direct_Dependencies>oglib_comparison-4.0.0.3</Direct_Dependencies>
- <Direct_Dependencies>oglib_error-4.1.0.13</Direct_Dependencies>
+ <Direct_Dependencies>oglib_error-4.2.0.23</Direct_Dependencies>
<Direct_Dependencies>oglib_file-4.0.0.20</Direct_Dependencies>
+ <Direct_Dependencies>oglib_string-4.0.0.6</Direct_Dependencies>
</Package_Dependencies>
<Custom_Action_VIs>
<Pre-Build_VI/>
Modified: trunk/rename_folder_of_vis/source/.vipc
===================================================================
(Binary files differ)
Added: trunk/rename_folder_of_vis/source/library/Dependencies.vi
===================================================================
(Binary files differ)
Property changes on: trunk/rename_folder_of_vis/source/library/Dependencies.vi
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/rename_folder_of_vis/source/library/RFOVIs--GetVersion.vi
===================================================================
(Binary files differ)
Modified: trunk/rename_folder_of_vis/source/library/Rename_Folder_of_VIs.vi
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-11-22 03:02:37
|
Revision: 1467
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1467&view=rev
Author: jgcode
Date: 2011-11-22 03:02:24 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Part of upgrade to VIPM 2011 file layout. Built v4.0.0.6 for release.
Added Paths:
-----------
trunk/ogedit_file_locate_in_project/locate_file_in_project.lvproj
trunk/ogedit_file_locate_in_project/source/.vipb
trunk/ogedit_file_locate_in_project/source/.vipc
trunk/ogedit_file_locate_in_project/source/images/
trunk/ogedit_file_locate_in_project/source/images/icon.png
trunk/ogedit_file_locate_in_project/source/library/Locate_in_Project.vi
trunk/ogedit_file_locate_in_project/source/user docs/
trunk/ogedit_file_locate_in_project/source/user docs/License Agreement.txt
Removed Paths:
-------------
trunk/ogedit_file_locate_in_project/source/Locate_in_Project.vi
Added: trunk/ogedit_file_locate_in_project/locate_file_in_project.lvproj
===================================================================
--- trunk/ogedit_file_locate_in_project/locate_file_in_project.lvproj (rev 0)
+++ trunk/ogedit_file_locate_in_project/locate_file_in_project.lvproj 2011-11-22 03:02:24 UTC (rev 1467)
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Project Type="Project" LVVersion="9008000">
+ <Item Name="My Computer" Type="My Computer">
+ <Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
+ <Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
+ <Property Name="server.tcp.enabled" Type="Bool">false</Property>
+ <Property Name="server.tcp.port" Type="Int">0</Property>
+ <Property Name="server.tcp.serviceName" Type="Str">My Computer/VI Server</Property>
+ <Property Name="server.tcp.serviceName.default" Type="Str">My Computer/VI Server</Property>
+ <Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
+ <Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
+ <Property Name="specify.custom.address" Type="Bool">false</Property>
+ <Item Name="source" Type="Folder">
+ <Item Name="images" Type="Folder">
+ <Item Name="icon.png" Type="Document" URL="../source/images/icon.png"/>
+ </Item>
+ <Item Name="library" Type="Folder">
+ <Item Name="Locate_in_Project.vi" Type="VI" URL="../source/library/Locate_in_Project.vi"/>
+ </Item>
+ <Item Name="user docs" Type="Folder">
+ <Item Name="License Agreement.txt" Type="Document" URL="../source/user docs/License Agreement.txt"/>
+ </Item>
+ <Item Name=".vipb" Type="Document" URL="../source/.vipb"/>
+ <Item Name=".vipc" Type="Document" URL="../source/.vipc"/>
+ </Item>
+ <Item Name="Dependencies" Type="Dependencies">
+ <Item Name="vi.lib" Type="Folder">
+ <Item Name="Simple Error Handler.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Simple Error Handler.vi"/>
+ <Item Name="DialogType.ctl" Type="VI" URL="/<vilib>/Utility/error.llb/DialogType.ctl"/>
+ <Item Name="General Error Handler.vi" Type="VI" URL="/<vilib>/Utility/error.llb/General Error Handler.vi"/>
+ <Item Name="DialogTypeEnum.ctl" Type="VI" URL="/<vilib>/Utility/error.llb/DialogTypeEnum.ctl"/>
+ <Item Name="General Error Handler CORE.vi" Type="VI" URL="/<vilib>/Utility/error.llb/General Error Handler CORE.vi"/>
+ <Item Name="Check Special Tags.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Check Special Tags.vi"/>
+ <Item Name="TagReturnType.ctl" Type="VI" URL="/<vilib>/Utility/error.llb/TagReturnType.ctl"/>
+ <Item Name="Set String Value.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Set String Value.vi"/>
+ <Item Name="GetRTHostConnectedProp.vi" Type="VI" URL="/<vilib>/Utility/error.llb/GetRTHostConnectedProp.vi"/>
+ <Item Name="Error Code Database.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Error Code Database.vi"/>
+ <Item Name="whitespace.ctl" Type="VI" URL="/<vilib>/Utility/error.llb/whitespace.ctl"/>
+ <Item Name="Trim Whitespace.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Trim Whitespace.vi"/>
+ <Item Name="Format Message String.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Format Message String.vi"/>
+ <Item Name="Find Tag.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Find Tag.vi"/>
+ <Item Name="Search and Replace Pattern.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Search and Replace Pattern.vi"/>
+ <Item Name="Set Bold Text.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Set Bold Text.vi"/>
+ <Item Name="Details Display Dialog.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Details Display Dialog.vi"/>
+ <Item Name="ErrWarn.ctl" Type="VI" URL="/<vilib>/Utility/error.llb/ErrWarn.ctl"/>
+ <Item Name="Clear Errors.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Clear Errors.vi"/>
+ <Item Name="eventvkey.ctl" Type="VI" URL="/<vilib>/event_ctls.llb/eventvkey.ctl"/>
+ <Item Name="Not Found Dialog.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Not Found Dialog.vi"/>
+ <Item Name="Three Button Dialog.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Three Button Dialog.vi"/>
+ <Item Name="Three Button Dialog CORE.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Three Button Dialog CORE.vi"/>
+ <Item Name="Longest Line Length in Pixels.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Longest Line Length in Pixels.vi"/>
+ <Item Name="Convert property node font to graphics font.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Convert property node font to graphics font.vi"/>
+ <Item Name="Get Text Rect.vi" Type="VI" URL="/<vilib>/picture/picture.llb/Get Text Rect.vi"/>
+ <Item Name="Get String Text Bounds.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Get String Text Bounds.vi"/>
+ <Item Name="LVBoundsTypeDef.ctl" Type="VI" URL="/<vilib>/Utility/miscctls.llb/LVBoundsTypeDef.ctl"/>
+ <Item Name="BuildHelpPath.vi" Type="VI" URL="/<vilib>/Utility/error.llb/BuildHelpPath.vi"/>
+ <Item Name="GetHelpDir.vi" Type="VI" URL="/<vilib>/Utility/error.llb/GetHelpDir.vi"/>
+ </Item>
+ </Item>
+ <Item Name="Build Specifications" Type="Build"/>
+ </Item>
+</Project>
Added: trunk/ogedit_file_locate_in_project/source/.vipb
===================================================================
--- trunk/ogedit_file_locate_in_project/source/.vipb (rev 0)
+++ trunk/ogedit_file_locate_in_project/source/.vipb 2011-11-22 03:02:24 UTC (rev 1467)
@@ -0,0 +1,156 @@
+<VI_Package_Builder_Settings Version="0.3" Created_Date="2011-11-22 10:13:14" Modified_Date="2011-11-22 10:56:59" Creator="Jonathon Green" Comments="" ID="e16ea9c1272933d57058f2b4072e39bf">
+ <Library_General_Settings>
+ <Package_File_Name>ogrsc_locate_file_in_project</Package_File_Name>
+ <Library_Version>4.0.0.7</Library_Version>
+ <Auto_Increment_Version>false</Auto_Increment_Version>
+ <Library_Source_Folder>.</Library_Source_Folder>
+ <Library_Output_Folder>..</Library_Output_Folder>
+ <Company_Name>OpenG.org</Company_Name>
+ <Library_Summary/>
+ <Library_License>BSD-3-Clause</Library_License>
+ <Package_LabVIEW_Version>9.0</Package_LabVIEW_Version>
+ <Community_Edition>false</Community_Edition>
+ <Package_Icon>00000D7E002800000C9A00000400000200020022002200080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA0000888888888888000077777777777700005555555555550000444444444444000022222222222200001111111111110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF00000000000000000000000000000000000000000000000000000000FFB4B4B4FF0000000000000000000000000000000000000000000000000000FFB4B4B4B4B4FF00000000000000000000000000000000000000000000000000FFB4B4B4B4B4FF00000000000000000081FCFCFCACAC00000000000000000000FFB4B4B4B4B4FF000000000000000000FC000000B4AC2B00000000000000000000FFB4B4B4FF00000000000000000000FC00B4B400FC2B00000000000000000000FFFFFFFF0000000000000000000000FC00B4B400FC2B00000000000000000000FFFF00000000000000000000000000ACB4000000FC2B00000000000000000000FFFF00000000000000000000000000ACACFCFCFCAC2B00000000000000000000FFFF00000000000000000000000000000000FC2B2B2B000000000000000000FFFF0000000000000000000000000000000000FC2B0000FCFCFCFCACAC000000FFFF0000000000000000000000000000000000FC2B0000FC00000005FE2B0000FFFF0000000000000000000000000000000000FCFCACFCFC00050559AC2B0000FFFF0000000000000000000000000000000000FC2B2B2BFC00050559FC2B000000000000000000000000000000000000000000FC2B0000AC05595959FC2B000000000000000000000000000000000000000000FC2B0000ACFEACFCFCAC2B000000000000000000000000000000000000000000FC2B0000002B2B2B2B2B2B000000000000000000000000000000000000000000FC2B0000ACACFEFEFEAC2B000000000000000000000000000000000000000000FC2B0000FC000000B9AC2B000000000000000000000000000000000000000000FCFCFCFCAC00B9B9C5AC2B000000000000000000000000000000000000000000002B2BF8FC00B9B9C51515000000000000000000000000000000000000000000F6F6F600ACB9C5C5C5AC2B00000000000000000000000000000000000000000000000000ACFEFEFEACAC2B000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001C0000003E0000007F0000007F007E007F007F003E007F003C007F0030007F0030007F0030000F0060000FFC60000FFE60000FFE60000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE000007FE00000EFE000000FE000000000000000000000000000002900000012000000020000000D01000000000100000000000A000000080000000000240024002900000012000000020000000D00B2B2B900010000000000100000001000000002002300000000000000000023002900000012000000020000000D00FCFCFD00010000000000100000001000000002002200010001000100010022002900000012000000020000000D00B2B2B900010000000000100000001000000002000000240024002400240000002900000012000000020000000D0080808A00010000000000100000001000000002000100230023002300230001</Package_Icon>
+ <Product_Name>OpenG Locate File In Project Tool</Product_Name>
+ <Was_Built>true</Was_Built>
+ </Library_General_Settings>
+ <Advanced_Settings>
+ <Package_Dependencies>
+ <Package_Conflicts>ogedit_file_locate_in_project >=1.0.0.3</Package_Conflicts>
+ </Package_Dependencies>
+ <Custom_Action_VIs>
+ <Pre-Build_VI/>
+ <Post-Build_VI/>
+ <Pre-Install_VI/>
+ <Post-Install_VI/>
+ <Pre-Uninstall_VI/>
+ <Post-Uninstall_VI/>
+ </Custom_Action_VIs>
+ <VI_Package_Configuration_File>.vipc</VI_Package_Configuration_File>
+ <Description>
+ <One_Line_Description_Summary>Locate File In Project</One_Line_Description_Summary>
+ <Description>Adds a 'Locate in Project' option to the File menu</Description>
+ <Copyright>Copyright (C) 2007 Joe 'orko' Sines; 2007 Jim Kring; 2011 Jonathon Green</Copyright>
+ <Packager>OpenG.org</Packager>
+ <URL>http://wiki.openg.org/Ogedit_file_locate_in_project</URL>
+ <Release_Notes>Package sources upgraded to LabVIEW 2009 (package now compatible with LV2009 or greater)
+Package build with VIPM 2011</Release_Notes>
+ </Description>
+ <Destinations>
+ <Toolkit_VIs>
+ <LLB>true</LLB>
+ <Preserve_Hierarchy>false</Preserve_Hierarchy>
+ <Path><file>\Locate File In Project.llb</Path>
+ </Toolkit_VIs>
+ <Examples>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>true</Preserve_Hierarchy>
+ <Path/>
+ </Examples>
+ <Custom_Probes>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>true</Preserve_Hierarchy>
+ <Path/>
+ </Custom_Probes>
+ <Custom_Errors>
+ <Preserve_Hierarchy>true</Preserve_Hierarchy>
+ <Path/>
+ </Custom_Errors>
+ <Help_Files>
+ <Preserve_Hierarchy>true</Preserve_Hierarchy>
+ <Path/>
+ </Help_Files>
+ <Template_VIs>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>true</Preserve_Hierarchy>
+ <Path/>
+ </Template_VIs>
+ <File_Menu>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>true</Preserve_Hierarchy>
+ <Path/>
+ </File_Menu>
+ <Tools_Menu>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>true</Preserve_Hierarchy>
+ <Path/>
+ </Tools_Menu>
+ <Help_Menu>
+ <LLB>false</LLB>
+ <Preserve_Hierarchy>true</Preserve_Hierarchy>
+ <Path/>
+ </Help_Menu>
+ </Destinations>
+ <Source_Files>
+ <Destination_Overrides>
+ <Path>.</Path>
+ <Destination>Toolkit VIs</Destination>
+ <Additional_Destination>false</Additional_Destination>
+ <Additional_Destination_Index>0</Additional_Destination_Index>
+ </Destination_Overrides>
+ <Destination_Overrides>
+ <Path>library\Locate_in_Project.vi</Path>
+ <Destination>Toolkit VIs</Destination>
+ <Additional_Destination>false</Additional_Destination>
+ <Additional_Destination_Index>0</Additional_Destination_Index>
+ </Destination_Overrides>
+ <Password_Overrides>
+ <Path>.</Path>
+ <Password/>
+ </Password_Overrides>
+ <Namespace_Overrides>
+ <Path>.</Path>
+ <Namespace_Type>Prefix</Namespace_Type>
+ <Namespace/>
+ </Namespace_Overrides>
+ <Exclusions>
+ <Path>images</Path>
+ </Exclusions>
+ <Exclusions>
+ <Path>user docs</Path>
+ </Exclusions>
+ <Toplevel_VIs>
+ <Path>library\Locate_in_Project.vi</Path>
+ </Toplevel_VIs>
+ </Source_Files>
+ <License_Agreement_Filepath>user docs\License Agreement.txt</License_Agreement_Filepath>
+ <Licensing_and_Activation>
+ <License_LF_file_path/>
+ <Licensed_library_file_path/>
+ <Perform_License_Binding>false</Perform_License_Binding>
+ <Purchase_URL/>
+ <License_File_Password/>
+ <Web_Activation_URL/>
+ <Phone_Activation_Number/>
+ <Auto_Activation_URL/>
+ <Library_Protection_Password><random:32></Library_Protection_Password>
+ </Licensing_and_Activation>
+ <Palette_Sets>
+ <Palette_Set_Name>Default</Palette_Set_Name>
+ <Use_Custom_Category>false</Use_Custom_Category>
+ <Custom_Category_Name>JGCODE</Custom_Category_Name>
+ <Custom_Category_Icon>0000050F002900000012000000020000000D00FFFFFF000100000000000A0000000800000000002000200028000000650000003F000000050007000800180000000000FFFFFF00000000000000000000000000000000000000010000000000000000010000000000000000010000010000000000010000010000010000010000000000000000001FFF3FFF3FFF3FFFBFFFFFFF1FFF00280000007A00000054000000090007000D00180000000000FFFFFF00000000000000000000000000000000000000010000010000000000010000000000000000000000010000000000010000000000010000000000000000010000000000010000010000000000000000000000000000000FFF6FFF8FFFAFFF9FFF6FFF0FFF0028000000500000002A0000000E0007001000180000000000FFFFFF00000000000000000000000000010000010000000000010000000000010000000000000000010000000000003FFF7FFFBFFFBFFFBFFF7FFF3FFF0028000000650000003F000000110007001400180000000000FFFFFF00000000000000000000000000000000010000000000010000000000010000010000000000010000010000000000010000000000010000000000000000000000001FFF5FFFBFFFBFFFBFFF5FFF1FFF0028000000650000003F000000150007001800180000000000FFFFFF00000000000000000000000000010000010000000000010000000000010000010000000000010000010000000000010000010000010000000000000000000000001FFFDFFFBFFFBFFFBFFFDFFF1FFF0028000000650000003F000000190007001C00180000000000FFFFFF00000000000000000000000000010000010000010000010000000000000000010000010000000000010000000000000000010000010000010000000000000000001FFFFFFF9FFFDFFF9FFFFFFF1FFF002900000012000000020000000D00CCCCFF000100000000000A0000000800190000002000200028000000650000003F001900060020000900180000000000FFFFFF00000000000000000000000000006C00010000006C00010000006C00016C00010000006C00016C00010000006C00010000006C00010000000000000000000000001FFF5FFFBFFFBFFFBFFF5FFF1FFF0028000000650000003F0019000A0020000D00180000000000FFFFFF00000000000000000000006C00016C00010000006C00010000006C00016C00016C00010000006C00010000000000006C00010000000000000000000000000000001FFFDFFFBFFFDFFF9FFF9FFF1FFF0028000000650000003F0019000E0020001100180000000000FFFFFF00000000000000000000006C00016C00016C00016C00010000000000006C00016C00010000006C00010000000000006C00016C00016C00010000000000000000001FFFFFFF9FFFDFFF9FFFFFFF1FFF00280000007A00000054001900120020001600180000000000FFFFFF00000000000000000000000000006C00010000000000006C00016C00016C00010000006C00016C00016C00010000006C00016C00010000006C00016C00016C00010000000000006C00010000000000000000000000000FFF9FFFDFFFDFFFBFFF9FFF0FFF00280000007A00000054001900170020001B00180000000000FFFFFF00000000000000000000000000000000006C00016C00010000006C00010000000000000000006C00010000006C00010000006C00010000000000006C00010000006C00016C00010000000000000000000000000000000FFF6FFF8FFFAFFF9FFF6FFF0FFF</Custom_Category_Icon>
+ <Controls_Palette_Information>
+ <Virtual_Palette_Base_Path>Controls</Virtual_Palette_Base_Path>
+ <Palette_Disk_Base_Path><menus>\Controls</Palette_Disk_Base_Path>
+ <Syncing_MNU_file/>
+ </Controls_Palette_Information>
+ <Functions_Palette_Information>
+ <Virtual_Palette_Base_Path>Functions</Virtual_Palette_Base_Path>
+ <Palette_Disk_Base_Path><menus>\Categories</Palette_Disk_Base_Path>
+ <Syncing_MNU_file/>
+ </Functions_Palette_Information>
+ </Palette_Sets>
+ <Install_Requirements>
+ <All_Windows>true</All_Windows>
+ <Windows_7>true</Windows_7>
+ <Windows_Vista>true</Windows_Vista>
+ <Windows_XP>true</Windows_XP>
+ <Mac_OS>true</Mac_OS>
+ <Linux>true</Linux>
+ <Built_LV_Version>false</Built_LV_Version>
+ <Built_LV_Version_or_greater>true</Built_LV_Version_or_greater>
+ </Install_Requirements>
+ </Advanced_Settings>
+ <Library_Palette_Definition/>
+</VI_Package_Builder_Settings>
\ No newline at end of file
Added: trunk/ogedit_file_locate_in_project/source/.vipc
===================================================================
(Binary files differ)
Property changes on: trunk/ogedit_file_locate_in_project/source/.vipc
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/ogedit_file_locate_in_project/source/Locate_in_Project.vi
===================================================================
(Binary files differ)
Added: trunk/ogedit_file_locate_in_project/source/images/icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/ogedit_file_locate_in_project/source/images/icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ogedit_file_locate_in_project/source/library/Locate_in_Project.vi
===================================================================
(Binary files differ)
Property changes on: trunk/ogedit_file_locate_in_project/source/library/Locate_in_Project.vi
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ogedit_file_locate_in_project/source/user docs/License Agreement.txt
===================================================================
--- trunk/ogedit_file_locate_in_project/source/user docs/License Agreement.txt (rev 0)
+++ trunk/ogedit_file_locate_in_project/source/user docs/License Agreement.txt 2011-11-22 03:02:24 UTC (rev 1467)
@@ -0,0 +1,16 @@
+OpenG Locate File In Project Tool
+
+Copyright (C) 2007 Joe 'orko' Sines; 2007 Jim Kring; 2011 Jonathon Green
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ * Neither the name of OpenG.org nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ANY COPYRIGHT HOLDER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-11-22 02:56:04
|
Revision: 1466
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1466&view=rev
Author: jgcode
Date: 2011-11-22 02:55:53 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Updated Copyrights after Danny Thompson tested and rebuilt v4.0.0.9 for release. Updated to latest Error dependency.
Modified Paths:
--------------
trunk/compare_vi_to_disk/source/.vipb
trunk/compare_vi_to_disk/source/.vipc
trunk/compare_vi_to_disk/source/user docs/License Agreement.txt
Modified: trunk/compare_vi_to_disk/source/.vipb
===================================================================
--- trunk/compare_vi_to_disk/source/.vipb 2011-11-22 01:53:12 UTC (rev 1465)
+++ trunk/compare_vi_to_disk/source/.vipb 2011-11-22 02:55:53 UTC (rev 1466)
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="0.3" Created_Date="2011-10-08 19:12:52" Modified_Date="2011-10-09 10:26:22" Creator="Jonathon Gren" Comments="" ID="3bc0053fd81658c54af32c563744541f">
+<VI_Package_Builder_Settings Version="0.3" Created_Date="2011-10-08 19:12:52" Modified_Date="2011-11-22 10:53:34" Creator="Jonathon Gren" Comments="" ID="b9e693b947ba895b32909e12a2e8070b">
<Library_General_Settings>
<Package_File_Name>ogrsc_compare_vi_to_disk</Package_File_Name>
- <Library_Version>4.0.0.9</Library_Version>
+ <Library_Version>4.0.0.10</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>..</Library_Output_Folder>
@@ -33,7 +33,7 @@
<Description>Adds a 'Compare to Disk...' option to the OpenG Tools menu, which opens the active VI and the copy on disk in the LabVIEW comparison tool.
Thanks to Ian Dees for his application 'lvdiff', from which this utility derives inspiration and code.</Description>
- <Copyright>Copyright (C) 2001 Ian Dees; 2005 Jim Kring, 2011 Jonathon Green</Copyright>
+ <Copyright>Copyright (C) 2001 Ian Dees; 2005 Jim Kring; 2011 Danny Thomson; 2011 Jonathon Green</Copyright>
<Packager>OpenG.org</Packager>
<URL>http://wiki.openg.org/Ogrsc_compare_vi_to_disk</URL>
<Release_Notes>Package sources upgraded to LabVIEW 2009 (package now compatible with LV2009 or greater)
Modified: trunk/compare_vi_to_disk/source/.vipc
===================================================================
(Binary files differ)
Modified: trunk/compare_vi_to_disk/source/user docs/License Agreement.txt
===================================================================
--- trunk/compare_vi_to_disk/source/user docs/License Agreement.txt 2011-11-22 01:53:12 UTC (rev 1465)
+++ trunk/compare_vi_to_disk/source/user docs/License Agreement.txt 2011-11-22 02:55:53 UTC (rev 1466)
@@ -1,6 +1,6 @@
OpenG Compare VI To Disk Tool
-Copyright (C) 2001 Ian Dees; 2005 Jim Kring, 2011 Jonathon Green
+Copyright (C) 2001 Ian Dees; 2005 Jim Kring; 2011 Danny Thomson; 2011 Jonathon Green
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-11-22 01:53:23
|
Revision: 1465
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1465&view=rev
Author: jgcode
Date: 2011-11-22 01:53:12 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Part of upgrade to VIPM 2011 file layout.
Added Paths:
-----------
trunk/ogedit_file_locate_in_project/source/library/
Removed Paths:
-------------
trunk/ogedit_file_locate_in_project/build rules/
trunk/ogedit_file_locate_in_project/build.vi
trunk/ogedit_file_locate_in_project/build_support/
trunk/ogedit_file_locate_in_project/docs/
Deleted: trunk/ogedit_file_locate_in_project/build.vi
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-11-02 10:33:53
|
Revision: 1464
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1464&view=rev
Author: jgcode
Date: 2011-11-02 10:33:45 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Updated project with new String to Character Array VI
TrackerID: 3419755
Modified Paths:
--------------
trunk/string/source/.vipb
trunk/string/source/library/VI Tree - string.vi
trunk/string/source/user docs/License Agreement.txt
trunk/string/string.lvproj
Added Paths:
-----------
trunk/string/source/library/String to Character Array.vi
trunk/string/tests/TEST - String to Character Array.vi
Modified: trunk/string/source/.vipb
===================================================================
--- trunk/string/source/.vipb 2011-10-20 00:05:12 UTC (rev 1463)
+++ trunk/string/source/.vipb 2011-11-02 10:33:45 UTC (rev 1464)
@@ -1,4 +1,4 @@
-<VI_Package_Builder_Settings Version="0.3" Created_Date="2010-12-07 17:22:49" Modified_Date="2011-08-06 00:57:00" Creator="Jonathon Green" Comments="" ID="291bcf46519e2cc74fb822779f7578f5">
+<VI_Package_Builder_Settings Version="0.3" Created_Date="2010-12-07 17:22:49" Modified_Date="2011-10-07 02:27:00" Creator="Jonathon Green" Comments="" ID="9f6b30d237d91d8420dbfa7a2ea1204c">
<Library_General_Settings>
<Package_File_Name>oglib_string</Package_File_Name>
<Library_Version>4.1.0.9</Library_Version>
@@ -31,7 +31,7 @@
<Description>
<One_Line_Description_Summary>OpenG String Library</One_Line_Description_Summary>
<Description>The OpenG String Library package contains several routines for operating on strings.</Description>
- <Copyright>2002-2007 Jim Kring; 2002 Cal-Bay Systems; 2004 Paul Sullivan; 2004 Michael C. Ashe; 2005-2006 MKS Instruments, Inc. (author: Doug Femec); 2010-2011 Jonathon Green; 2011 Shaun Rumbell</Copyright>
+ <Copyright>2002-2007 Jim Kring; 2002 Cal-Bay Systems; 2004 Paul Sullivan; 2004 Michael C. Ashe; 2005-2006 MKS Instruments, Inc. (author: Doug Femec); 2010-2011 Jonathon Green; 2011 Shaun Rumbell, 2011 Darin.k; 2011 Wouter Geelen; 2011 Fabiola De la Cueva</Copyright>
<Packager>OpenG.org</Packager>
<URL>http://wiki.openg.org/Oglib_string</URL>
<Release_Notes>[FIX] 3303663 - "Format Variant Into String" doesn't handle Timestamp
@@ -41,7 +41,8 @@
[FIX] 3275249 - Update "OpenG Comment"
[FIX] 3386135 - OpenG Comment should be a Merge VI in palette
[FIX] 1914597 - "Format Variant Into String" missing DAQ, DAQmx, and VISA type
-[FIX] 921506 - "Format Variant Into String" should accept RefNums</Release_Notes>
+[FIX] 921506 - "Format Variant Into String" should accept RefNums
+[FIX] 3419755 - Create new String To Character Array VI</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
@@ -381,16 +382,29 @@
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
- <NameSub_Menu_Name>Trim Whitespace 1.vi</NameSub_Menu_Name>
- <Short_Name>Trim Whitespace 1</Short_Name>
+ <NameSub_Menu_Name>Trim Whitespace.vi</NameSub_Menu_Name>
+ <Short_Name>Trim Whitespace</Short_Name>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>1</Row>
<Column>1</Column>
</Position>
<Icon>00000000</Icon>
- <Path>library\Trim Whitespace 1.vi</Path>
+ <Path>library\Trim Whitespace.vi</Path>
</Items_Data>
+ <Items_Data>
+ <Type>Item</Type>
+ <Sub_Palette_Index>-1</Sub_Palette_Index>
+ <NameSub_Menu_Name>String to Character Array.vi</NameSub_Menu_Name>
+ <Short_Name>String to Character Array</Short_Name>
+ <is_Merge_VI>false</is_Merge_VI>
+ <Position>
+ <Row>4</Row>
+ <Column>3</Column>
+ </Position>
+ <Icon>00000000</Icon>
+ <Path>library\String to Character Array.vi</Path>
+ </Items_Data>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
\ No newline at end of file
Added: trunk/string/source/library/String to Character Array.vi
===================================================================
(Binary files differ)
Property changes on: trunk/string/source/library/String to Character Array.vi
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/string/source/library/VI Tree - string.vi
===================================================================
(Binary files differ)
Modified: trunk/string/source/user docs/License Agreement.txt
===================================================================
--- trunk/string/source/user docs/License Agreement.txt 2011-10-20 00:05:12 UTC (rev 1463)
+++ trunk/string/source/user docs/License Agreement.txt 2011-11-02 10:33:45 UTC (rev 1464)
@@ -1,6 +1,6 @@
OpenG String Library
-2002-2007 Jim Kring; 2002 Cal-Bay Systems; 2004 Paul Sullivan; 2004 Michael C. Ashe; 2005-2006 MKS Instruments, Inc. (author: Doug Femec); 2010-2011 Jonathon Green; 2011 Shaun Rumbell, 2011 Darin.K
+2002-2007 Jim Kring; 2002 Cal-Bay Systems; 2004 Paul Sullivan; 2004 Michael C. Ashe; 2005-2006 MKS Instruments, Inc. (author: Doug Femec); 2010-2011 Jonathon Green; 2011 Shaun Rumbell, 2011 Darin.k; 2011 Wouter Geelen; 2011 Fabiola De la Cueva
All rights reserved.
Modified: trunk/string/string.lvproj
===================================================================
--- trunk/string/string.lvproj 2011-10-20 00:05:12 UTC (rev 1463)
+++ trunk/string/string.lvproj 2011-11-02 10:33:45 UTC (rev 1464)
@@ -115,6 +115,7 @@
<Item Name="String to 1D Array.vi" Type="VI" URL="../source/library/String to 1D Array.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
+ <Item Name="String to Character Array.vi" Type="VI" URL="../source/library/String to Character Array.vi"/>
<Item Name="To Camel Case.vi" Type="VI" URL="../source/library/To Camel Case.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
@@ -173,6 +174,7 @@
<Item Name="TEST - String to 1D Array.vi" Type="VI" URL="../tests/TEST - String to 1D Array.vi">
<Property Name="marked" Type="Int">0</Property>
</Item>
+ <Item Name="TEST - String to Character Array.vi" Type="VI" URL="../tests/TEST - String to Character Array.vi"/>
<Item Name="TEST - TEMPLATE_SCALAR.vit" Type="VI" URL="../tests/TEST - TEMPLATE_SCALAR.vit">
<Property Name="marked" Type="Int">0</Property>
</Item>
Added: trunk/string/tests/TEST - String to Character Array.vi
===================================================================
(Binary files differ)
Property changes on: trunk/string/tests/TEST - String to Character Array.vi
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2011-10-20 00:05:18
|
Revision: 1463
http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1463&view=rev
Author: jgcode
Date: 2011-10-20 00:05:12 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Added (post-release) attribution to Ed Dickens for reviewing last package released.
Modified Paths:
--------------
trunk/numeric/source/.vipb
trunk/numeric/source/user docs/License Agreement.txt
Modified: trunk/numeric/source/.vipb
===================================================================
--- trunk/numeric/source/.vipb 2011-10-20 00:03:49 UTC (rev 1462)
+++ trunk/numeric/source/.vipb 2011-10-20 00:05:12 UTC (rev 1463)
@@ -1,4 +1,4 @@
-<VI_Package_Builder_Settings Version="0.3" Created_Date="2010-12-17 15:35:35" Modified_Date="2011-10-15 18:49:05" Creator="Jonathon Green" Comments="" ID="3b42b2c66d61ea6323aba321874288a5">
+<VI_Package_Builder_Settings Version="0.3" Created_Date="2010-12-17 15:35:35" Modified_Date="2011-10-20 01:29:47" Creator="Jonathon Green" Comments="" ID="e80992df5f32c7a10629ba1eeb168aed">
<Library_General_Settings>
<Package_File_Name>oglib_numeric</Package_File_Name>
<Library_Version>4.1.0.9</Library_Version>
@@ -28,7 +28,7 @@
<Description>
<One_Line_Description_Summary>OpenG Numeric Library</One_Line_Description_Summary>
<Description>The OpenG Numeric Library package contains several routines for operating on numeric data.</Description>
- <Copyright>2002-2003 Jean-Pierre Drolet, Jim Kring; 2010-2011 Jonathon Green</Copyright>
+ <Copyright>2002-2003 Jean-Pierre Drolet; Jim Kring; 2010-2011 Jonathon Green; 2011 Ed Dickens</Copyright>
<Packager>OpenG.org</Packager>
<URL>http://wiki.openg.org/Oglib_numeric</URL>
<Release_Notes>[MOD] 3419758 - Create new Random Number Within Range - I32 VI
Modified: trunk/numeric/source/user docs/License Agreement.txt
===================================================================
--- trunk/numeric/source/user docs/License Agreement.txt 2011-10-20 00:03:49 UTC (rev 1462)
+++ trunk/numeric/source/user docs/License Agreement.txt 2011-10-20 00:05:12 UTC (rev 1463)
@@ -1,6 +1,6 @@
OpenG Numeric Library
-Copyright (c) 2002-2003 Jean-Pierre Drolet, Jim Kring; 2010-2011 Jonathon Green
+Copyright (c) 2002-2003 Jean-Pierre Drolet; Jim Kring; 2010-2011 Jonathon Green; 2011 Ed Dickens
All rights reserved.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
