Commit 908e5d3c authored by David Llewellyn-Jones's avatar David Llewellyn-Jones

Updated Functy version numbering to 0.24 in anticipation of building the installation packages.

parent 2fceb9a7
The MIT License
Copyright (c) 2009 David Llewellyn-Jones
Copyright (c) 2012 David Llewellyn-Jones
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......
......@@ -71,7 +71,7 @@ Run the installer: MinGW-5.1.3.exe
5. Check that gcc is available from the command line
type: gcc -v
output: gcc version 3.4.2 (mingw-special)
output: "gcc version 3.4.2 (mingw-special)"
6. Install gnet
Copy gnet from gnet.zip into C:\GTK
......
Functy-0.24: 29-May-2012
- Added full support for parametric curves with cylindrical cross-section, including both CPU and GPU rendering.
Functy-0.23: 27-May-2012
- Added initial (CPU-only) support for parametric curves with cylindrical cross-section.
......
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT([Functy], [0.23], [david-web02@flypig.co.uk])
AC_INIT([Functy], [0.24], [david@flypig.co.uk])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([-Wall -Werror])
AC_CONFIG_SRCDIR([src/functy.c])
......
functy (0.24.0-1) unstable; urgency=low
* Added full support for parametric curves with cylindrical cross-section, including both CPU and GPU rendering.
-- David Llewellyn-Jones <david@flypig.co.uk> Tue, 29 May 2012 11:06:00 +0100
functy (0.23.0-1) unstable; urgency=low
* Added initial (CPU-only) support for parametric curves with cylindrical cross-section.
......
This package was debianized by David Llewellyn-Jones <david@flypig.co.uk> on
Sun, 27 May 2012 20:45:00 +0100.
Mon, 29 May 2012 11:06:00 +0100.
It was downloaded from http://functy.sourceforge.net
......
......@@ -8,8 +8,8 @@
<Target Name="Bootstrapper">
<GenerateBootstrapper
ApplicationName="Functy"
ApplicationFile="functy-0.22-win32-bin.msi"
ApplicationUrl="http://downloads.sourceforge.net/sourceforge/functy/"
ApplicationFile="functy-0.24-win32-bin.msi"
ApplicationUrl="https://sourceforge.net/projects/functy/files/"
BootstrapperItems="@(BootstrapperFile)"
Culture="en"
CopyComponents="false"
......
<?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='Functy' Id='67A5E242-2F68-4044-A1CB-51F55BCA5856'
UpgradeCode='000BF5D5-D50A-47B3-9140-2930475CB672'
Language='1033' Codepage='1252' Version='0.2.3' Manufacturer='David Llewellyn-Jones'>
<Package Id='*' Keywords='Installer'
Description="Functy Installer"
Comments='Functy is released under an MIT-style licence. See http://functy.sourceforge.net for more info.'
Manufacturer='David Llewellyn-Jones'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<Media Id='1' Cabinet='Functy.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
<Property Id='DiskPrompt' Value="Functy Installation [1]" />
<Directory Id='TARGETDIR' Name='SourceDir'>
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<Directory Id='INSTALLDIR' Name='Functy'>
<Component Id='MainExecutable' Guid='9F0B2D18-33F9-4316-931D-4DB544EDA3AA'>
<File Id='FunctyEXE' Name='functy.exe' DiskId='1'
Source='functy.exe' Vital='yes'>
</File>
<RemoveFile Id='Settings' On='uninstall' Name='.functy.xml' />
</Component>
<Directory Id='FunctyExamplesFolder' Name='examples'>
<Component Id='ExampleFiles' Guid='877D949E-B708-4A17-97CE-A0EE7A9404FD'>
<File Id='ExampleBouncingBall' Name='BouncingBall.xml' DiskId='1' Source='examples\BouncingBall.xml' />
<File Id='ExampleBumpySlides' Name='BumpySlides.xml' DiskId='1' Source='examples\BumpySlides.xml' />
<File Id='ExampleGrid' Name='Grid.xml' DiskId='1' Source='examples\Grid.xml' />
<File Id='ExampleIslands01' Name='Islands01.xml' DiskId='1' Source='examples\Islands01.xml' />
<File Id='ExampleLavaLamp01' Name='LavaLamp01.xml' DiskId='1' Source='examples\LavaLamp01.xml' />
<File Id='ExampleLavaLamp02' Name='LavaLamp02.xml' DiskId='1' Source='examples\LavaLamp02.xml' />
<File Id='ExampleLissajousLights' Name='LissajousLights.xml' DiskId='1' Source='examples\LissajousLights.xml' />
<File Id='ExampleLogo' Name='Logo.xml' DiskId='1' Source='examples\Logo.xml' />
<File Id='ExampleMetal' Name='Metal.xml' DiskId='1' Source='examples\Metal.xml' />
<File Id='ExamplePulsate' Name='Pulsate.xml' DiskId='1' Source='examples\Pulsate.xml' />
<File Id='ExampleScaryForest' Name='ScaryForest.xml' DiskId='1' Source='examples\ScaryForest.xml' />
<File Id='ExampleScarySlides' Name='ScarySlides.xml' DiskId='1' Source='examples\ScarySlides.xml' />
<File Id='ExampleSpikes01' Name='Spikes01.xml' DiskId='1' Source='examples\Spikes01.xml' />
<File Id='ExampleSpiral01' Name='Spiral01.xml' DiskId='1' Source='examples\Spiral01.xml' />
<File Id='ExampleSpiral02' Name='Spiral02.xml' DiskId='1' Source='examples\Spiral02.xml' />
<File Id='ExampleTartan' Name='Tartan.xml' DiskId='1' Source='examples\Tartan.xml' />
</Component>
<Component Id='StartMenuExampleShortcuts' Guid='3FF0D33E-DE33-4DFB-AFBF-8CC03DCE7E97'>
<Shortcut Id="StartMenuExamples" Directory="ProgramMenuDir" Name="Examples"
WorkingDirectory='INSTALLDIR' />
<Condition>SHORTCUT_STARTMENU</Condition>
<CreateFolder/>
<RemoveFolder Id="ProgramMenuDirExamples" Directory="ProgramMenuDir" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\Functy" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</Directory>
<Component Id='StartMenuShortcuts' Guid='3239B14E-1A37-48C0-9338-42215056F511'>
<Shortcut Id="StartMenuFuncty" Directory="ProgramMenuDir" Name="Functy"
WorkingDirectory='INSTALLDIR'
Target="[!FunctyEXE]"
Icon="functy.ico" IconIndex="0" />
<Condition>SHORTCUT_STARTMENU</Condition>
<CreateFolder/>
<RemoveFolder Id="ProgramMenuDirFuncty" Directory="ProgramMenuDir" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\Functy" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
<Component Id='DesktopShortcuts' Guid='90716911-CC37-4830-BA88-368927B97F98'>
<Shortcut Id="DesktopFuncty" Directory="DesktopFolder" Name="Functy"
WorkingDirectory='INSTALLDIR'
Target="[!FunctyEXE]"
Icon="functy.ico" IconIndex="0" />
<Condition>SHORTCUT_DESKTOP</Condition>
<CreateFolder/>
<RegistryValue Root="HKCU" Key="Software\Functy" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
<Directory Id='FunctyAssetsFolder' Name='assets'>
<Component Id='FunctyAssets' Guid='F7CFF205-205D-437E-B97C-3DCC15F280A4'>
<File Id='FunctyGlade' Name='Functy.glade' DiskId='1' Source='assets\Functy.glade' Vital='yes' />
<File Id='FunctyCartesianVertex' Name='cartesian.vs' DiskId='1' Source='assets\cartesian.vs' Vital='yes' />
<File Id='FunctyCartesianFragment' Name='cartesian.fs' DiskId='1' Source='assets\cartesian.fs' Vital='yes' />
<File Id='FunctySphericalVertex' Name='spherical.vs' DiskId='1' Source='assets\spherical.vs' Vital='yes' />
<File Id='FunctySphericalFragment' Name='spherical.fs' DiskId='1' Source='assets\spherical.fs' Vital='yes' />
</Component>
</Directory>
<Component Id='FreeGlutLibrary' Guid='E6C828A3-1517-42BA-9860-ECC7A07DBAA4'>
<File Id='freeglutDLL' Name='freeglut.dll' DiskId='1' Source='freeglut.dll' />
</Component>
<Component Id='InfoFiles' Guid='EAEB814F-BA22-4194-BC27-06EEAB05188D'>
<File Id='ReadMe' Name='README' DiskId='1' Source='README' />
<File Id='News' Name='NEWS' DiskId='1' Source='NEWS' />
<File Id='Install' Name='INSTALL' DiskId='1' Source='INSTALL' />
<File Id='Authors' Name='AUTHORS' DiskId='1' Source='AUTHORS' />
<File Id='Copying' Name='COPYING' DiskId='1' Source='COPYING' />
</Component>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name='Functy' />
</Directory>
<Directory Id="DesktopFolder" Name="Desktop" />
</Directory>
<Feature Id='Complete' Title="Functy" Description="The Functy graph rendering package" Display="expand" Level='1' ConfigurableDirectory='INSTALLDIR'>
<Feature Id='MainProgram' Title="Program" Description="The main executable" Level='1'>
<ComponentRef Id='MainExecutable' />
<ComponentRef Id='FunctyAssets' />
<ComponentRef Id='FreeGlutLibrary' />
</Feature>
<Feature Id='StartMenu' Title="Start Menu Shortcuts" Description="Shortcuts to the program added to your Start menu" Level='1'>
<ComponentRef Id='StartMenuShortcuts' />
<ComponentRef Id='StartMenuExampleShortcuts' />
</Feature>
<Feature Id='Desktop' Title="Desktop Shortcut" Description="Shortcuts to the program added to your Desktop" Level='1'>
<ComponentRef Id='DesktopShortcuts' />
</Feature>
<Feature Id='Info' Title='Information' Description='ReadMe, licence and basic documentation.' Level='1'>
<ComponentRef Id='InfoFiles' />
</Feature>
<Feature Id='Examples' Title='Examples' Description='Example function files that can be loaded into Functy.' Level='1'>
<ComponentRef Id='ExampleFiles' />
</Feature>
</Feature>
<Property Id="WIXUI_INSTALLDIR">INSTALLDIR</Property>
<Property Id="SHORTCUT_DESKTOP">1</Property>
<Property Id="SHORTCUT_STARTMENU">1</Property>
<UIRef Id="WixUI_Functy" />
<UIRef Id="WixUI_ErrorProgressText" />
<Icon Id="functy.ico" SourceFile="functy.ico" />
</Product>
<Product Name='Functy' Id='67A5E242-2F68-4044-A1CB-51F55BCA5856'
UpgradeCode='000BF5D5-D50A-47B3-9140-2930475CB672'
Language='1033' Codepage='1252' Version='0.2.4' Manufacturer='David Llewellyn-Jones'>
<Package Id='*' Keywords='Installer'
Description="Functy Installer"
Comments='Functy is released under an MIT-style licence. See http://functy.sourceforge.net for more info.'
Manufacturer='David Llewellyn-Jones'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<Media Id='1' Cabinet='Functy.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
<Property Id='DiskPrompt' Value="Functy Installation [1]" />
<Directory Id='TARGETDIR' Name='SourceDir'>
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<Directory Id='INSTALLDIR' Name='Functy'>
<Component Id='MainExecutable' Guid='9F0B2D18-33F9-4316-931D-4DB544EDA3AA'>
<File Id='FunctyEXE' Name='functy.exe' DiskId='1'
Source='functy.exe' Vital='yes'>
</File>
<RemoveFile Id='Settings' On='uninstall' Name='.functy.xml' />
</Component>
<Directory Id='FunctyExamplesFolder' Name='examples'>
<Component Id='ExampleFiles' Guid='877D949E-B708-4A17-97CE-A0EE7A9404FD'>
<File Id='ExampleBouncingBall' Name='BouncingBall.xml' DiskId='1' Source='examples\BouncingBall.xml' />
<File Id='ExampleBumpySlides' Name='BumpySlides.xml' DiskId='1' Source='examples\BumpySlides.xml' />
<File Id='ExampleGrid' Name='Grid.xml' DiskId='1' Source='examples\Grid.xml' />
<File Id='ExampleIslands01' Name='Islands01.xml' DiskId='1' Source='examples\Islands01.xml' />
<File Id='ExampleLavaLamp01' Name='LavaLamp01.xml' DiskId='1' Source='examples\LavaLamp01.xml' />
<File Id='ExampleLavaLamp02' Name='LavaLamp02.xml' DiskId='1' Source='examples\LavaLamp02.xml' />
<File Id='ExampleLissajousLights' Name='LissajousLights.xml' DiskId='1' Source='examples\LissajousLights.xml' />
<File Id='ExampleLogo' Name='Logo.xml' DiskId='1' Source='examples\Logo.xml' />
<File Id='ExampleLoops01' Name='Loops01.xml' DiskId='1' Source='examples\Loops01.xml' />
<File Id='ExampleMetal' Name='Metal.xml' DiskId='1' Source='examples\Metal.xml' />
<File Id='ExamplePulsate' Name='Pulsate.xml' DiskId='1' Source='examples\Pulsate.xml' />
<File Id='ExampleScaryForest' Name='ScaryForest.xml' DiskId='1' Source='examples\ScaryForest.xml' />
<File Id='ExampleScarySlides' Name='ScarySlides.xml' DiskId='1' Source='examples\ScarySlides.xml' />
<File Id='ExampleSpikes01' Name='Spikes01.xml' DiskId='1' Source='examples\Spikes01.xml' />
<File Id='ExampleSpiral01' Name='Spiral01.xml' DiskId='1' Source='examples\Spiral01.xml' />
<File Id='ExampleSpiral02' Name='Spiral02.xml' DiskId='1' Source='examples\Spiral02.xml' />
<File Id='ExampleTartan' Name='Tartan.xml' DiskId='1' Source='examples\Tartan.xml' />
<File Id='ExampleWrap01' Name='Wrap01.xml' DiskId='1' Source='examples\Wrap01.xml' />
<File Id='ExampleWrap02' Name='Wrap02.xml' DiskId='1' Source='examples\Wrap02.xml' />
</Component>
<Component Id='StartMenuExampleShortcuts' Guid='3FF0D33E-DE33-4DFB-AFBF-8CC03DCE7E97'>
<Shortcut Id="StartMenuExamples" Directory="ProgramMenuDir" Name="Examples"
WorkingDirectory='INSTALLDIR' />
<Condition>SHORTCUT_STARTMENU</Condition>
<CreateFolder/>
<RemoveFolder Id="ProgramMenuDirExamples" Directory="ProgramMenuDir" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\Functy" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</Directory>
<Component Id='StartMenuShortcuts' Guid='3239B14E-1A37-48C0-9338-42215056F511'>
<Shortcut Id="StartMenuFuncty" Directory="ProgramMenuDir" Name="Functy"
WorkingDirectory='INSTALLDIR'
Target="[!FunctyEXE]"
Icon="functy.ico" IconIndex="0" />
<Condition>SHORTCUT_STARTMENU</Condition>
<CreateFolder/>
<RemoveFolder Id="ProgramMenuDirFuncty" Directory="ProgramMenuDir" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\Functy" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
<Component Id='DesktopShortcuts' Guid='90716911-CC37-4830-BA88-368927B97F98'>
<Shortcut Id="DesktopFuncty" Directory="DesktopFolder" Name="Functy"
WorkingDirectory='INSTALLDIR'
Target="[!FunctyEXE]"
Icon="functy.ico" IconIndex="0" />
<Condition>SHORTCUT_DESKTOP</Condition>
<CreateFolder/>
<RegistryValue Root="HKCU" Key="Software\Functy" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
<Directory Id='FunctyAssetsFolder' Name='assets'>
<Component Id='FunctyAssets' Guid='F7CFF205-205D-437E-B97C-3DCC15F280A4'>
<File Id='FunctyGlade' Name='Functy.glade' DiskId='1' Source='assets\Functy.glade' Vital='yes' />
<File Id='FunctyCartesianVertex' Name='cartesian.vs' DiskId='1' Source='assets\cartesian.vs' Vital='yes' />
<File Id='FunctyCartesianFragment' Name='cartesian.fs' DiskId='1' Source='assets\cartesian.fs' Vital='yes' />
<File Id='FunctySphericalVertex' Name='spherical.vs' DiskId='1' Source='assets\spherical.vs' Vital='yes' />
<File Id='FunctySphericalFragment' Name='spherical.fs' DiskId='1' Source='assets\spherical.fs' Vital='yes' />
<File Id='FunctyCurveVertex' Name='curve.vs' DiskId='1' Source='assets\curve.vs' Vital='yes' />
<File Id='FunctyCurveFragment' Name='curve.fs' DiskId='1' Source='assets\curve.fs' Vital='yes' />
</Component>
</Directory>
<Component Id='FreeGlutLibrary' Guid='E6C828A3-1517-42BA-9860-ECC7A07DBAA4'>
<File Id='freeglutDLL' Name='freeglut.dll' DiskId='1' Source='freeglut.dll' />
</Component>
<Component Id='InfoFiles' Guid='EAEB814F-BA22-4194-BC27-06EEAB05188D'>
<File Id='ReadMe' Name='README' DiskId='1' Source='README' />
<File Id='News' Name='NEWS' DiskId='1' Source='NEWS' />
<File Id='Install' Name='INSTALL' DiskId='1' Source='INSTALL' />
<File Id='Authors' Name='AUTHORS' DiskId='1' Source='AUTHORS' />
<File Id='Copying' Name='COPYING' DiskId='1' Source='COPYING' />
</Component>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name='Functy' />
</Directory>
<Directory Id="DesktopFolder" Name="Desktop" />
</Directory>
<Feature Id='Complete' Title="Functy" Description="The Functy graph rendering package" Display="expand" Level='1' ConfigurableDirectory='INSTALLDIR'>
<Feature Id='MainProgram' Title="Program" Description="The main executable" Level='1'>
<ComponentRef Id='MainExecutable' />
<ComponentRef Id='FunctyAssets' />
<ComponentRef Id='FreeGlutLibrary' />
</Feature>
<Feature Id='StartMenu' Title="Start Menu Shortcuts" Description="Shortcuts to the program added to your Start menu" Level='1'>
<ComponentRef Id='StartMenuShortcuts' />
<ComponentRef Id='StartMenuExampleShortcuts' />
</Feature>
<Feature Id='Desktop' Title="Desktop Shortcut" Description="Shortcuts to the program added to your Desktop" Level='1'>
<ComponentRef Id='DesktopShortcuts' />
</Feature>
<Feature Id='Info' Title='Information' Description='ReadMe, licence and basic documentation.' Level='1'>
<ComponentRef Id='InfoFiles' />
</Feature>
<Feature Id='Examples' Title='Examples' Description='Example function files that can be loaded into Functy.' Level='1'>
<ComponentRef Id='ExampleFiles' />
</Feature>
</Feature>
<Property Id="WIXUI_INSTALLDIR">INSTALLDIR</Property>
<Property Id="SHORTCUT_DESKTOP">1</Property>
<Property Id="SHORTCUT_STARTMENU">1</Property>
<UIRef Id="WixUI_Functy" />
<UIRef Id="WixUI_ErrorProgressText" />
<Icon Id="functy.ico" SourceFile="functy.ico" />
</Product>
</Wix>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment