[arch-commits] Commit in sympow/trunk (4 files)
Antonio Rojas
arojas at archlinux.org
Tue Jul 24 10:55:49 UTC 2018
Date: Tuesday, July 24, 2018 @ 10:55:49
Author: arojas
Revision: 363282
Cleanup
Modified:
sympow/trunk/PKGBUILD
Deleted:
sympow/trunk/sympow-datafiles.patch
sympow/trunk/sympow-initialize-tacks.patch
sympow/trunk/sympow.sh
-------------------------------+
PKGBUILD | 6 ---
sympow-datafiles.patch | 76 ----------------------------------------
sympow-initialize-tacks.patch | 38 --------------------
sympow.sh | 10 -----
4 files changed, 130 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-24 10:55:12 UTC (rev 363281)
+++ PKGBUILD 2018-07-24 10:55:49 UTC (rev 363282)
@@ -29,10 +29,4 @@
cd $pkgname-v$pkgver
make DESTDIR="$pkgdir" install
-# mkdir -p "$pkgdir"/usr/{bin,share/sympow}
-# cp -r *.gp datafiles "$pkgdir"/usr/share/sympow
-# cp sympow "$pkgdir"/usr/bin/sympow_bin
-# cp new_data "$pkgdir"/usr/bin/new_data
-
-# install -Dm755 "$srcdir"/sympow.sh "$pkgdir"/usr/bin/sympow
}
Deleted: sympow-datafiles.patch
===================================================================
--- sympow-datafiles.patch 2018-07-24 10:55:12 UTC (rev 363281)
+++ sympow-datafiles.patch 2018-07-24 10:55:49 UTC (rev 363282)
@@ -1,76 +0,0 @@
-diff -p -up SYMPOW-1.019/disk.c.orig SYMPOW-1.019/disk.c
---- SYMPOW-1.019/disk.c.orig 2009-09-03 18:20:37.000000000 -0300
-+++ SYMPOW-1.019/disk.c 2009-09-03 18:22:08.000000000 -0300
-@@ -47,8 +47,8 @@ static int get_params(int which,int sp,i
- while (1)
- {if (!getline0(F,LINE,64))
- {printf("**ERROR** %s not found in param_data file\n",S);
-- if (!HECKE) printf("It can be added with './sympow -new_data %i",sp);
-- else printf("It can be added with './sympow -new_data %i",ep);
-+ if (!HECKE) printf("It can be added with 'sympow -new_data %i",sp);
-+ else printf("It can be added with 'sympow -new_data %i",ep);
- if ((sp&1) || HECKE) printf("d%i",dv); if ((HECKE) && (sp>1)) printf("h");
- if ((CM_CASE) && ((sp&3)==0)) printf("c"); printf("'\n"); exit(-1);}
- if ((S[0]==LINE[0]) && (S[1]==LINE[1]) && (S[2]==LINE[2]) && (S[3]==LINE[3])
-diff -p -up SYMPOW-1.019/generate.c.orig SYMPOW-1.019/generate.c
---- SYMPOW-1.019/generate.c.orig 2009-09-03 18:20:49.000000000 -0300
-+++ SYMPOW-1.019/generate.c 2009-09-03 18:22:23.000000000 -0300
-@@ -101,9 +101,11 @@ int assure_line(char *STR)
-
- void new_sympow_s1(char *A)
- {procit(A);
-- printf("echo 'Removing any old data files'\n"); printf("cd datafiles\n");
-- printf("%s -f %s %s %s\n",RM,Mtxt1,Stxt1,Mbin1);
-- if (HILO) printf("%s -f %s %s %s\n",RM,Mtxt2,Stxt2,Mbin2); printf("cd ..\n");}
-+ printf("if [ -d datafiles ]; then\n");
-+ printf(" echo 'Removing any old data files'\n"); printf(" pushd datafiles\n touch param_data\n");
-+ printf(" %s -f %s %s %s\n",RM,Mtxt1,Stxt1,Mbin1);
-+ if (HILO) printf(" %s -f %s %s %s\n",RM,Mtxt2,Stxt2,Mbin2); printf(" popd\n");
-+ printf("else\n mkdir datafiles\n touch datafiles/param_data\nfi\n");}
-
- void new_sympow_pari(char *A)
- {int i; procit(A); pari_params();
-@@ -142,10 +144,10 @@ void new_sympow_s2(char *A)
- trimit(Mtxt1); trimit(Stxt1); if (HILO) {trimit(Mtxt2); trimit(Stxt2);}
- printf("echo 'Turning the meshes into binaries'\n");
- printf("NUM=`%s -c AT %s`\n",GREP,Mtxt1);
-- printf("../sympow -txt2bin $NUM %s < %s\n",Mbin1,Mtxt1);
-+ printf("sympow -txt2bin $NUM %s < %s\n",Mbin1,Mtxt1);
- if (HILO)
- {printf("NUM=`%s -c AT %s`\n",GREP,Mtxt2);
-- printf("../sympow -txt2bin $NUM %s < %s\n",Mbin2,Mtxt2);}
-+ printf("sympow -txt2bin $NUM %s < %s\n",Mbin2,Mtxt2);}
- printf("cd ..\n");}
-
- void rewarp_params()
-diff -p -up SYMPOW-1.019/new_data.orig SYMPOW-1.019/new_data
---- SYMPOW-1.019/new_data.orig 2009-09-03 18:20:25.000000000 -0300
-+++ SYMPOW-1.019/new_data 2009-09-03 18:21:31.000000000 -0300
-@@ -1,7 +1,7 @@
- #! /bin/sh
- #
- # This script should not need to be run directly,
--# but will be automatically executed via "./sympow -new_data []"
-+# but will be automatically executed via "sympow -new_data []"
- #
- # example direct usages
- # sh new_data /bin/sh /usr/bin/gp '-sp 3 -dv 2'
-@@ -18,11 +18,11 @@ echo "Running the new_data script for $3
-
- SH=$1 && GP=$2
- echo "Making the datafiles for $3" && echo "" &&
--./sympow -rewarp && ./sympow -shell1 "$3" &&
--./sympow -shell1 "$3" | $SH &&
-+sympow -rewarp && sympow -shell1 "$3" &&
-+sympow -shell1 "$3" | $SH &&
- echo 'Running the gp script' && echo "" &&
--./sympow -pari "$3" &&
--./sympow -pari "$3" | $GP -q > /dev/null && echo "" &&
--./sympow -shell2 "$3" &&
--./sympow -shell2 "$3" | $SH &&
--./sympow -rewarp && echo "Finished with $3"
-+sympow -pari "$3" &&
-+sympow -pari "$3" | $GP -q > /dev/null && echo "" &&
-+sympow -shell2 "$3" &&
-+sympow -shell2 "$3" | $SH &&
-+sympow -rewarp && echo "Finished with $3"
Deleted: sympow-initialize-tacks.patch
===================================================================
--- sympow-initialize-tacks.patch 2018-07-24 10:55:12 UTC (rev 363281)
+++ sympow-initialize-tacks.patch 2018-07-24 10:55:49 UTC (rev 363282)
@@ -1,38 +0,0 @@
-diff -u sympow-1.018.1/analrank.c sympow/analrank.c
---- src/analrank.c 2007-08-21 06:57:01.000000000 +0200
-+++ analrank.c 2017-04-24 10:13:45.757479996 +0200
-@@ -18,7 +18,8 @@
- S[20]+=2; S[31]+=4; S[42]+=6; S[53]+=8;
- NT=process_string(S,UB); go(NT,NT); return;}
- else {AP_SAVE=1; apsave=malloc(primes_upper_bound(NT)*sizeof(int));}
-- if (NT<MIN_TERMS) NT=MIN_TERMS; f=go(NT,NT); free_data();
-+ if (NT<MIN_TERMS) NT=MIN_TERMS;
-+ f=go(NT,NT); free_data();
- if (Abs(f)/REAL_PERIOD[0]>0.0001)
- {if (w1==1) printf("Analytic Rank is 0 : L-value %.5e\n",f);
- else printf("Analytic Rank is 1 : L'-value %.5e\n",f); return;}
-diff -u sympow-1.018.1/prepare.c sympow/prepare.c
---- src/prepare.c 2007-08-21 06:57:01.000000000 +0200
-+++ prepare.c 2017-04-24 10:50:10.941042660 +0200
-@@ -147,7 +147,7 @@
- WIGGLE=malloc(K*sizeof(QD)); WIGSQI=malloc(K*sizeof(QD));
- EXPAND0_LIM=malloc(K*sizeof(QD)); STEP_SIZE=malloc(K*sizeof(QD));
- TOO_BIG=malloc(K*sizeof(QD)); NUM_LOGS=malloc(K*sizeof(QD));
-- TACKON=malloc(K*sizeof(int)); TACKS=malloc(K*sizeof(QD*));
-+ TACKON=malloc(K*sizeof(int)); TACKS=calloc(K,sizeof(QD*));
- w=malloc(K*sizeof(int)); wprec=malloc(K*sizeof(int));
- DECAY=malloc(K*sizeof(QD)); NUM_WIGS=malloc(K*sizeof(QD));
- for (i=0;i<K;i++) QD_copy(wmax,QD_zero,COND[i]); WHICH=0; NUM_SUMS=0;
-diff -u sympow-1.018.1/util.c sympow/util.c
---- src/util.c 2007-08-21 06:57:01.000000000 +0200
-+++ util.c 2017-04-24 10:50:52.013938229 +0200
-@@ -23,7 +23,8 @@
- if (DEBUG>=2) printf("Done with get_primes_ll\n"); free(auxp);}
-
- void free_data()
--{QD **P; int i; if (DEBUG) printf("free_data\n"); free(TACKS[0]);
-+{QD **P; int i; if (DEBUG) printf("free_data\n");
-+ if(TACKS[0]!=NULL) free(TACKS[0]);
- P=TABLE[0]; for (i=0;i<MESH_COUNT[0];i++) free(P[i]); free(P);
- P=POWSER[0]; for (i=0;i<=NUM_LOGS[0];i++) free(P[i]); free(P);}
-
Deleted: sympow.sh
===================================================================
--- sympow.sh 2018-07-24 10:55:12 UTC (rev 363281)
+++ sympow.sh 2018-07-24 10:55:49 UTC (rev 363282)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-SYMPOW_LOCAL="$HOME"/.local/share/sympow
-
-if [ ! -d "${SYMPOW_LOCAL}" ]; then
- mkdir -p "${SYMPOW_LOCAL}"
- cp -r /usr/share/sympow/* "${SYMPOW_LOCAL}"
-fi
-cd "$SYMPOW_LOCAL"
-exec sympow_bin "$@"
More information about the arch-commits
mailing list