[PD-cvs] packages/win32_inno pd-settings.reg, NONE, 1.1 Makefile, 1.2, 1.3 pd-inno.iss.in, 1.2, 1.3 generate_inno_files.sh, 1.1, NONE
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Sun Nov 27 06:04:04 CET 2005
Update of /cvsroot/pure-data/packages/win32_inno
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15441/win32_inno
Modified Files:
Makefile pd-inno.iss.in
Added Files:
pd-settings.reg
Removed Files:
generate_inno_files.sh
Log Message:
lots of build bug fixes and additions, including pixeltango and lots of binary files, including many flext externals. this will probably be pd-0.38.4-extended-RC5
--- NEW FILE: pd-settings.reg ---
Windows Registry Editor Version 5.00
[HKEY_LOCAL_MACHINE\SOFTWARE\Pd]
"path1"="c:/progra~1/pd/extra/cyclone"
"path2"="c:/progra~1/pd/extra/iemabs"
"path2"="c:/progra~1/pd/extra/unauthorized"
"loadlib1"="gem"
"loadlib2"="pmpd"
"loadlib3"="vasp"
"loadlib4"="xsample"
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/packages/win32_inno/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 26 Nov 2005 04:18:52 -0000 1.2
--- Makefile 27 Nov 2005 05:04:02 -0000 1.3
***************
*** 21,27 ****
UNAME=$(UNAME)
- install: extended_install
#==============================================================================#
--- 21,33 ----
UNAME=$(UNAME)
+ PD_INNO_SETUP = pd-inno.iss
+ install: $(PD_INNO_SETUP)
+ cd $(packages_src) && make $(DEST_PATHS) extended_install
+ cd .. && make $(DEST_PATHS) doc_format
+ install -p pd-settings.reg $(prefix)
+ @echo " "
+ @echo "win32_inno install succeeded!"
#==============================================================================#
***************
*** 31,43 ****
#==============================================================================#
! PD_ISS_NAME = pd-inno.iss
! $(PD_ISS_NAME): $(PD_ISS_NAME).in
! @echo "Making Inno Setup file: $(PD_ISS_NAME)"
! cat "$(PD_ISS_NAME).in" | \
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/g' | \
! sed 's/PD_VERSION/$(PD_VERSION)-$(PACKAGE_VERSION)/g' > \
! $(PD_ISS_NAME)
! -./generate_inno_files.sh >> $(PD_ISS_NAME)
! # start $(PD_ISS_NAME)
#==============================================================================#
--- 37,53 ----
#==============================================================================#
! # since I can't get Pd to compile, here are some hacks to assemble a package
! # from binaries
! no_compile_hacks:
! cp -a /c/Program\ Files/pd-0.38-4 $(prefix)/
!
! $(PD_INNO_SETUP): $(PD_INNO_SETUP).in
! @echo "Making Inno Setup file: $(PD_INNO_SETUP)"
! cat "$(PD_INNO_SETUP).in" | \
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/g' | \
! sed 's/PD_VERSION/$(PD_VERSION)/g' | \
! sed 's/PACKAGE_VERSION/$(PACKAGE_VERSION)/g' > \
! $(PD_INNO_SETUP)
! # start $(PD_INNO_SETUP)
#==============================================================================#
***************
*** 47,51 ****
#==============================================================================#
! extended_install:
! cd $(packages_src) && make $(DEST_PATHS) install
--- 57,63 ----
#==============================================================================#
! clean:
! rm $(PD_INNO_SETUP)
! cd $(packages_src) && make $(DEST_PATHS) clean
!
Index: pd-inno.iss.in
===================================================================
RCS file: /cvsroot/pure-data/packages/win32_inno/pd-inno.iss.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pd-inno.iss.in 23 Nov 2005 21:42:19 -0000 1.2
--- pd-inno.iss.in 27 Nov 2005 05:04:02 -0000 1.3
***************
*** 8,12 ****
[Setup]
AppName=pd
! AppVerName=PACKAGE_NAME
AppPublisher=pure-data.org
AppPublisherURL=http://puredata.org
--- 8,12 ----
[Setup]
AppName=pd
! AppVerName=Pd-PD_VERSION-PACKAGE_VERSION
AppPublisher=pure-data.org
AppPublisherURL=http://puredata.org
***************
*** 35,44 ****
Name: {userdesktop}\Pure Data; Filename: {app}\bin\pd.exe; Tasks: desktopicon; IconFilename: {app}\lib\pd.ico; IconIndex: 0; WorkingDir: {app}
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Pure Data; Filename: {app}\bin\pd.exe; Tasks: quicklaunchicon; WorkingDir: {app}; IconFilename: {app}\lib\pd.ico; IconIndex: 0
-
- ;Name: {group}\Pure Data (no video); Filename: {app}\pd-novideo.bat; IconFilename: {app}\lib\pd.ico; IconIndex: 0; Tasks: quicklaunchicon desktopicon; WorkingDir: {app}
Name: {group}\Documentation\Pd Manual; Filename: {app}\doc\1.manual\index.htm
Name: {group}\Documentation\Pd Drums Tutorial; Filename: {app}\doc\tutorials\footils\pddrums\pddrums.html
Name: {group}\Documentation\Gem Manual; Filename: {app}\doc\gem\00.manual\index.html
Name: {group}\Documentation\Gem Primer; Filename: {app}\doc\gem\GemPrimer.pdf
--- 35,47 ----
Name: {userdesktop}\Pure Data; Filename: {app}\bin\pd.exe; Tasks: desktopicon; IconFilename: {app}\lib\pd.ico; IconIndex: 0; WorkingDir: {app}
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Pure Data; Filename: {app}\bin\pd.exe; Tasks: quicklaunchicon; WorkingDir: {app}; IconFilename: {app}\lib\pd.ico; IconIndex: 0
Name: {group}\Documentation\Pd Manual; Filename: {app}\doc\1.manual\index.htm
Name: {group}\Documentation\Pd Drums Tutorial; Filename: {app}\doc\tutorials\footils\pddrums\pddrums.html
Name: {group}\Documentation\Gem Manual; Filename: {app}\doc\gem\00.manual\index.html
Name: {group}\Documentation\Gem Primer; Filename: {app}\doc\gem\GemPrimer.pdf
+ ;-----------------------------------------------------------------------------
+ ; GRIPD
+ #ifexist "build\bin\gripd.exe"
+ Name: {group}\GrIPD; Filename: {app}\bin\gripd.exe
+ #endif
***************
*** 73,85 ****
Source: pdpatch.ico; DestDir: {app}\lib
Source: pd.ico; DestDir: {app}\lib
- #ifexist "pd-nolibs.bat"
- Source: pd-nolibs.bat; DestDir: {app}
- #endif
- #ifexist "pd.bat"
- Source: pd.bat; DestDir: {app}
- #endif
- #ifexist "pd-novideo.bat"
- Source: pd-novideo.bat; DestDir: {app}
- #endif
;
;
--- 76,79 ----
***************
*** 87,95 ****
; put pdsend and pdreceive in the System dir so that they are in the path
;
! Source: build\bin\pdsend.exe; DestDir: {sys}; Flags: confirmoverwrite
! Source: build\bin\pdreceive.exe; DestDir: {sys}; Flags: confirmoverwrite
; add Cyclone's cyclist.exe if it is present
#ifexist "build\bin\cyclist.exe"
! Source: build\bin\cyclist.exe; DestDir: {sys}; Flags: confirmoverwrite
#endif
;
--- 81,89 ----
; put pdsend and pdreceive in the System dir so that they are in the path
;
! Source: build\bin\pdsend.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
! Source: build\bin\pdreceive.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
; add Cyclone's cyclist.exe if it is present
#ifexist "build\bin\cyclist.exe"
! Source: build\bin\cyclist.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder
#endif
;
***************
*** 105,122 ****
;
;-----------------------------------------------------------------------------
! ; non CVS files
! ;
! #ifexist "noncvs\extra"
! Source: noncvs\extra\*.dll; DestDir: {app}\extra
! #endif
! #ifexist "noncvs\doc\5.reference"
! Source: noncvs\doc\5.reference\*.*; DestDir: {app}\doc\5.reference; Flags:
! ignoreversion
! #endif
! ;
! ;
! ;-----------------------------------------------------------------------------
! ; AUTO-GENERATED
! ; below this line should be blank since the rest of this file is generated
! ; by the packages/win32_inno/Makefile. <hans at at.or.at>
;
--- 99,114 ----
;
;-----------------------------------------------------------------------------
! ; build system files
;
+ Source: build\doc\manuals\Pd\Welcome.html; DestDir: {app}; Flags: isreadme; Tasks:
+ Source: build\doc\manuals\Pd\ReadMe.html; DestDir: {app}; Flags: isreadme
+ Source: build\doc\manuals\Pd\License.html; DestDir: {app}; Flags: isreadme
+ Source: build\doc\manuals\Pd\PD LICENSE.txt; DestDir: {app}; Flags: isreadme
+ Source: build\pd-settings.reg; DestDir: {app}; Flags: ignoreversion
+ Source: build\bin\*.*; DestDir: {app}\bin; Flags: ignoreversion confirmoverwrite recursesubdirs uninsremovereadonly
+ Source: build\doc\*.*; DestDir: {app}\doc; Flags: ignoreversion confirmoverwrite recursesubdirs uninsremovereadonly; Attribs: readonly
+ Source: build\extra\*.*; DestDir: {app}\extra; Flags: ignoreversion recursesubdirs uninsremovereadonly promptifolder; Attribs: readonly
+ Source: build\lib\*.*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs
+ Source: build\portaudio\*.*; DestDir: {app}\portaudio; Flags: ignoreversion recursesubdirs
+ Source: build\src\*.*; DestDir: {app}\src; Flags: ignoreversion recursesubdirs
+ Source: build\tcl\*.*; DestDir: {app}\tcl; Flags: ignoreversion recursesubdirs
--- generate_inno_files.sh DELETED ---
More information about the Pd-cvs
mailing list