diff --git a/.gitignore b/.gitignore index 039f94486..d60ca923e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,62 +1,7 @@ -# Autotools generated files -locale/Makefile.in -Makefile -aclocal.m4 -autom4te.cache -config.status -bin-stamp -.deps -.dirstamp -lib-stamp -libtool -stamp-h* -stamp-po -*.stamp - # Files created by VSCode .vscode/* -# Handcrafted makefiles -!lib-src/expat/amiga/Makefile -!lib-src/libnyquist/nyquist/sys/unix/*/Makefile -!lib-src/lv2/Makefile -!lib-src/mod-script-pipe/Makefile - # Generated files by build system -lib-src/expat/expat_config.h -lib-src/libflac/doc/Doxyfile -lib-src/libflac/config.h -lib-src/libflac/test/common.sh -lib-src/libid3tag/config.h -lib-src/libid3tag/libid3tag.list -lib-src/libmad/config.h -lib-src/libmad/libmad.list -lib-src/libmad/mad.h -lib-src/libogg/config.h -lib-src/libogg/include/ogg/config_types.h -lib-src/libogg/libogg.spec -lib-src/libsndfile/build-test-tarball.mk -lib-src/libsndfile/doc/libsndfile.css -lib-src/libsndfile/libsndfile.spec -lib-src/libsndfile/man/sndfile-deinterleave.1 -lib-src/libsndfile/man/sndfile-metadata-set.1 -lib-src/libsndfile/src/config.h -lib-src/libsndfile/src/sndfile.h -lib-src/libsndfile/src/version-metadata.rc -lib-src/libsndfile/tests/pedantic-header-test.sh -lib-src/libsndfile/tests/test_wrapper.sh -lib-src/libsoxr/soxr-config.h -lib-src/libsoxr/src/libsoxr-dev.src -lib-src/libsoxr/src/libsoxr.src -lib-src/libsoxr/tests/ref-*.s32 -lib-src/libvorbis/config.h -lib-src/libvorbis/doc/Doxyfile -lib-src/libvorbis/libvorbis.spec -lib-src/sbsms/libsbsms.spec -lib-src/sbsms/src/config.h -lib-src/soundtouch/include/soundtouch_config.h -lib-src/twolame/doc/html/Doxyfile -lib-src/twolame/libtwolame/config.h locale/POTFILES src/tenacity.desktop src/RevisionIdent.h @@ -65,35 +10,11 @@ src/configwin.h *.pc # CMake build output -lib-src/libsoxr/CMakeCache.txt -lib-src/libsoxr/*.cmake CMakeFiles/ CTestTestfile.cmake cmake_install.cmake build/* -# Waf build output -lib-src/lv2/.buildvars -lib-src/lv2/include/ -lib-src/lv2/*/build/ -lib-src/lv2/srcdir.mk -.lock-waf_linux2_build - -# Mac build outputs -mac/Audacity.xcodeproj/project.xcworkspace/contents.xcworkspacedata -mac/Audacity.xcodeproj/project.xcworkspace/xcshareddata/Audacity.xccheckout -mac/Makefile -mac/confdefs.h -mac/config.status -mac/conftest.c -mac/help/ -mac/images/ -mac/lib-src/ -mac/libtool -mac/po/ -mac/src/ -mac/tests/ - # Doxygen output dox/ @@ -146,54 +67,11 @@ dox/ # Executable without extension /audacity src/audacity -lib-src/expat/examples/elements -lib-src/expat/examples/outline -lib-src/expat/xmlwf/xmlwf -lib-src/libflac/examples/c/decode/file/example_c_decode_file -lib-src/libflac/examples/c/encode/file/example_c_encode_file -lib-src/libflac/examples/cpp/decode/file/example_cpp_decode_file -lib-src/libflac/examples/cpp/encode/file/example_cpp_encode_file -lib-src/libflac/src/flac/flac -lib-src/libflac/src/metaflac/metaflac -lib-src/libflac/src/test_grabbag/cuesheet/test_cuesheet -lib-src/libflac/src/test_grabbag/picture/test_picture -lib-src/libflac/src/test_libFLAC++/test_libFLAC++ -lib-src/libflac/src/test_libFLAC/test_libFLAC -lib-src/libflac/src/test_seeking/test_seeking -lib-src/libflac/src/test_streams/test_streams -lib-src/libogg/src/test_bitwise -lib-src/libogg/src/test_framing -lib-src/libsndfile/src/G72x/g72x_test -lib-src/libsndfile/src/test_main -lib-src/libsoxr/examples/1a-lsr -lib-src/libsoxr/examples/3-options-input-fn -lib-src/libsoxr/tests/vector-cmp -lib-src/libsoxr/tests/vector-gen -lib-src/libvorbis/lib/test_sharedbook -lib-src/portaudio-v19/bin/ -lib-src/soundtouch/source/SoundStretch/soundstretch -lib-src/twolame/frontend/twolame -lib-src/twolame/simplefrontend/stwolame # Mac Specific .DS_Store xcuserdata *.xcconfig -mac/build - -# Windows specific -win/Debug -win/Release -win/Projects/*/Debug -win/Projects/*/Release -win/.vs/ -win/packages -win/.nuget -win-alt-build - -# All those help files -help/manual* -help/temp* # Misc src/RevisionIdent.h @@ -221,4 +99,5 @@ appimagetool/* # VSCode .vscode/ +# vcpkg vcpkg_installed diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index db826bbd3..2dec491e8 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -13,27 +13,9 @@ list( APPEND EXCLUDES .git .gitattributes .github + .gitea .gitignore - .travis.yml - appveyor.yml -# lib-src/expat -# lib-src/libid3tag -# lib-src/libmad -# lib-src/libogg -# lib-src/libscorealign -# lib-src/libvorbis - lib-src/portaudio-v19/bindings - lib-src/portaudio-v19/doc - lib-src/portaudio-v19/testcvs - lib-src/portmidi/pm_csharp - lib-src/portmidi/pm_dylib - lib-src/portmidi/pm_java - lib-src/portmidi/pm_mingw - lib-src/portmidi/pm_python - lib-src/portmidi/pm_qt - lib-src/portmidi/pm_test - lib-src/portmidi/portmidi_cdt.zip -# lib-src/soundtouch + .woodpecker mac plug-ins/analyze.ny plug-ins/fadein.ny diff --git a/scripts/mailman-discard.pl b/scripts/mailman-discard.pl deleted file mode 100755 index 97f8359f3..000000000 --- a/scripts/mailman-discard.pl +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env perl - -# Mailman-discard -# Written by Dominic Mazzoni, 2003 -# Released into the Public Domain -# NO WARRANTY - -print "This script uses 'curl' to connect to Sourceforge's mailman server\n"; -print "and discard all of the pending messages in a mailbox. This is\n"; -print "useful when an account gets hit with a virus or lots of spam.\n"; -print "\n"; -print "Note that ALL pending messages are discarded, with no notice sent\n"; -print "to anyone! You CANNOT recover messages after running this script!\n"; -print ""; - -print "Enter Sourceforge list name (such as 'audacity-devel'): "; -$list = ; - -print "Enter list password (warning, not hidden): "; -$pass = ; -chop $pass; - -print "Logging in and getting info...\n"; - -$out = `curl --data 'adminpw=$pass' --dump-header cookiefile https://lists.sourceforge.net/lists/admindb/$list`; - -$data = ""; - -@lines = split("\n", $out); - -$count = 0; -foreach $line (@lines) { - if ($line =~ 'INPUT name="([0-9]+)" type="RADIO" value="3"') { - $count++; - if ($data eq "") { - $data = "$1=3"; - } - else { - $data = "$data&$1=3"; - } - } -} - -if ($count == 0) { - print "Couldn't find any messages to discard!\n"; - exit; -} - -print "Discarding $count messages from $list\n"; - -$out = `curl --cookie cookiefile --data '$data' https://lists.sourceforge.net/lists/admindb/$list`; - -@lines = split("\n", $out); - -foreach $line (@lines) { - if ($line =~ 'no pending requests') { - print "Success!\n"; - exit; - } -} - -print "Done, but couldn't verify success."; - -# arch-tag: dc81de17-0bcb-4131-988e-3a3dad0e8e8d - diff --git a/scripts/maketarball.sh b/scripts/maketarball.sh deleted file mode 100755 index 6640923de..000000000 --- a/scripts/maketarball.sh +++ /dev/null @@ -1,302 +0,0 @@ -#!/bin/bash - -# Copyright 2003, 2004, 2005 Dominic Mazzoni and Matt Brubeck -# Distributed under the GNU General Public License 2.0. -# See the file LICENSE.txt for details. -# Re-written in Bash by Richard Ash 2006 - 2013 - -function myrmrvf { - # a replacement for rm -rvf that has it's output controlled - # by the value of the first argument - # setting it to 1 makes it verbose, to anything else makes it quiet - if [ $1 -eq 1 ] ; then #verbose mode - shift - echo "rm -rf $*" - rm -rf $* - else - # quietly - shift - rm -rf $* - fi -} - -function myrmvf { - # a replacement for rm -vf that has it's output controlled - # by the value of the first argument - # setting it to 1 makes it verbose, to anything else makes it quiet - if [ $1 -eq 1 ] ; then #verbose mode - shift - echo "rm -f $*" - rm -f $* - else - # quietly - shift - rm -f $* - fi -} - -function myfindrm { - # search the file tree removing files that match the specified pattern in - # the second argument, with output controlled by the value of the first - # argument. - # setting it to 1 makes it verbose, to anything else makes it quiet - if [ $1 -eq 1 ] ; then - find . -name "$2" -print -delete - else - find . -name "$2" -delete - fi -} - -function cleanfulltree { - # does the clean-up op on the full source tree prior to building the full - # tarball - printf "making distclean ... " - if [ $1 -eq 1 ] ; then - make distclean - else - make distclean 2>/dev/null > /dev/null - fi - status=${?} - if [ ${status} -eq 0 ] ; then - printf "Done\n" - else - echo "Failed to make distclean: exit status was ${status}" - exit ${status} - fi - - printf "removing GIT directories ... " - myrmrvf $1 .git .gitignore - myrmrvf $1 .gitignore - myrmrvf $1 .gitattributes - printf "Done\n" - - printf "removing vim / emacs temp files ... " - myfindrm $1 "*~" - printf "Done\n" - - printf "removing Python droppings ... " - myfindrm $1 "*.pyc" - printf "Done\n" - - printf "removing executable and other intermediate files ... " - myrmvf $1 src/audacity src/.depend src/.gchdepend - myfindrm $1 config.status - myfindrm $1 config.log - myfindrm $1 config.cache - find . -depth -name 'autom4te.cache' -execdir rm -rf '{}' ';' - find . -depth -name '.deps' -execdir rm -rf '{}' ';' - myfindrm $1 aclocal.m4 - printf "Done\n" - - printf "removing orphaned symlinks in lib-src/ ... " - myrmvf $1 lib-src/*.a - printf "Done\n" - - printf "removing doxygen output files ... " - myrmrvf $1 dox - printf "Done\n" - - printf "removing unused libraries from GIT tree ..." - myrmrvf $1 lib-src/libscorealign - printf "Done\n" -} - -# remove all the things we have in GIT for convenience rather than being -# necessary -function slimtree { - printf "removing todo lists ... " - myrmvf $1 todo.txt - printf "Done\n" - - # we cannot remove tests/ because subsequent builds fail ... - printf "removing scripts and tests ... " - myrmrvf $1 scripts tests/ProjectCheckTests/ - printf "Done\n" - - printf "removing libraries that should be installed locally ... " - myrmrvf $1 lib-src/expat lib-src/libid3tag - myrmrvf $1 lib-src/libmad lib-src/libogg - myrmrvf $1 lib-src/libvorbis lib-src/soundtouch - # these bindings aren't built by default, we don't need them - myrmrvf $1 lib-src/portaudio-v19/bindings/ - printf "Done\n" - - printf "removing qa ... " - myrmrvf $1 qa - printf "Done\n" - - printf "removing unused portaudio-v19 directories ... " - myrmrvf $1 lib-src/portaudio-v19/docs - myrmrvf $1 lib-src/portaudio-v19/pa_asio - myrmrvf $1 lib-src/portaudio-v19/pa_sgi - myrmrvf $1 lib-src/portaudio-v19/pa_mac_sm - myrmrvf $1 lib-src/portaudio-v19/testcvs - printf "Done\n" - - printf "removing unused portmidi directories ... " - myrmrvf $1 lib-src/portmidi/pm_cl - myrmrvf $1 lib-src/portmidi/pm_csharp - myrmrvf $1 lib-src/portmidi/pm_dylib - myrmrvf $1 lib-src/portmidi/pm_java - myrmrvf $1 lib-src/portmidi/pm_mingw - myrmrvf $1 lib-src/portmidi/pm_python - myrmrvf $1 lib-src/portmidi/pm_qt - myrmrvf $1 lib-src/portmidi/pm_test - myrmrvf $1 lib-src/portmidi/portmidi_cdt.zip - printf "Done\n" - - printf "removing Nyquist plug-ins that are just for show ... " - myrmvf $1 plug-ins/analyze.ny plug-ins/fadein.ny plug-ins/fadeout.ny - myrmvf $1 plug-ins/undcbias.ny - printf "Done\n" - - printf "Removing developer scripts not needed to build audacity ... " - myrmrvf $1 scripts/mw2html_audacity - printf "Done\n" - - printf "Removing Mac and Windows build files ... " - myrmrvf $1 mac - myrmrvf $1 win - printf "Done\n" -} - -echo "Maketarball 2.1.0 -- make an Audacity distribution tarball" - -# check number of arguments, if not one then print a usage message -if [ $# -ne 1 ] ; then - echo "Script to make directory trees for audacity source tarballs" - echo "Usage: $0 " - echo "Where mode is either \"quiet\" or \"verbose\"" - exit 1 -fi - -if [ "$1" = "quiet" ] ; then - mode=0 -elif [ "$1" = "verbose" ] ; then - mode=1 -else - echo "The argument to $0 must be either \"quiet\" or \"verbose\"" - exit 1 -fi - -if [ ! -f "src/Audacity.h" ] ; then - echo "$0 must be run from top-level audacity directory" - exit 1 -fi - -# capture some directory information, we'll want it later -sourcedir="$(pwd)" # where the sources are -cd .. -topdir="$(pwd)" # one level up where the tarballs come out -tmpsrc="${topdir}/$(mktemp -d audacity-src-XXXXXX)" # where initial modifications are done - -printf "making copy of source directory ... " -cp -pr "${sourcedir}/." "${tmpsrc}" -cd "${tmpsrc}" -printf "Done\n" - -# The script relies on make working, so Makefiles need to be present. This -# means that configure must have been run on the sources. In general, it doesn't -# matter what options, but the generation of a Makefile in lib-src/ in -# particular is important. Check that lib-src/Makefile is present and newer than -# lib-src/Makefile.in before continuing - -# Mac OS X also has problems if libsndfile isn't configured with automake -# dependency turned off, so we should check that libsndfile is clean, and ask -# for reconfiguration if not. -reconf=0 -if [ -f "lib-src/Makefile" ] ; then - # we have a Makefile - is it new enough? - t2=$(date +%s -r "lib-src/Makefile") - t1=$(date +%s -r "lib-src/Makefile.in") - if [ $t1 -gt $t2 ] ; then - # not new enough, reconfigure - reconf=1 - fi -else - # if no Makefile, definitely need to configure - reconf=1 -fi - -# these are the arguments we will pass to configure when it is run -configargs="--enable-maintainer-mode" - -if [ $reconf -eq 1 ] ; then - echo "Your Makefiles are out of date or missing. (Re)running configure to" - echo "create up-to-date Makefiles before building tarballs..." - echo " ./configure ${configargs}" - - # if we are in silent mode, then redirect the output of configure - if [ $mode -eq 1 ] ; then - $SHELL -c "./configure ${configargs}" - else - $SHELL -c "./configure ${configargs}" > /dev/null 2>&1 - fi - if [ ${?} -ne 0 ] ; then - echo "Error - configure exited with non-zero status!" - exit 1 - fi -fi - -# The version number is stored in a C++ header as a set of #defines. Trying to -# parse this with another language (as was done first with Perl and then with -# awk) is always going to be fragile, so we use a C++ pre-processor (which -# strangely enough we are pretty much guaranteed to have) to do it. Essentially -# we have a trivial bit of C++ code stored in-line in this script which is fed -# through the pre-processor to get the version string components where we can -# find them. - -if [ ! -x "config.status" ] ; then - echo "config.status is not present or executable - cannot proceed" - exit 1 -fi - -echo -n "Getting program version ... " -# first off, find out what C++ pre-processor configure has found for us to use -# (because we want the same one that will be used to build Audacity). This is a -# neat trick using the config.status script left behind after configure has -# been run -cppprog="$(echo '@CXX@' | ./config.status --file=-)" - -# run the preprocessor, convert output to shell variables, and evaluate to -# define them -eval $(cpp -E <