Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update web frameworks to the latest release #1106

Closed
wants to merge 13 commits into from
Closed

Update web frameworks to the latest release #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
99f774c
Update to Autoconf 2.72
fel1x-developer Dec 30, 2023
9788bb1
Format HTML, CSS, and Javascript files
fel1x-developer Jan 1, 2024
4d6303d
Remove webkit exception
fel1x-developer Jan 1, 2024
20742ae
Move jquery files to jquery-1.11.1 folder
fel1x-developer Jan 1, 2024
99a5ce2
Update jquery to 1.12.4
fel1x-developer Jan 1, 2024
8ab9b5e
Update bootstrap to 3.4.1
fel1x-developer Jan 1, 2024
aec2aef
Update DataTables to 1.13.8
fel1x-developer Jan 1, 2024
9cbd245
Remove non-existing javascript file
fel1x-developer Jan 1, 2024
f0f3b23
Update jquery to 3.7.1
fel1x-developer Jan 1, 2024
62d216e
Import .gitignore for Autotools from Github
fel1x-developer Jan 1, 2024
45aeec2
Update README.md
fel1x-developer Jan 2, 2024
419c319
Update .cirrus.yml
fel1x-developer Jan 2, 2024
1039ff8
Install autoconf, automake, and libtool in CI
fel1x-developer Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ check_task:
ccache_setup_script:
- env IGNORE_OSVERSION=yes pkg install -y ccache-static
- ccache --max-size=${CCACHE_SIZE}
autotool_setup_script:
- env IGNORE_OSVERSION=yes pkg install -y autoconf automake libtool
# Build with asserts/debugging for checks. distcheck won't use asserts.
compile_script:
- ./autogen.sh
- ./configure --enable-debug=yes || { cat config.log; exit 1; }
- make ${MAKEJOBS}
test_jail_prep_script:
Expand Down
66 changes: 57 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,60 @@
# https://github.com/github/gitignore/blob/main/Autotools.gitignore
# http://www.gnu.org/software/automake

Makefile.in
/ar-lib
/mdate-sh
/py-compile
/test-driver
/ylwrap
.deps/
.dirstamp

# http://www.gnu.org/software/autoconf

autom4te.cache
/autoscan.log
/autoscan-*.log
/aclocal.m4
/compile
/config.cache
/config.guess
/config.h.in
/config.log
/config.status
/config.sub
/configure
/configure.scan
/depcomp
/install-sh
/missing
/stamp-h1

# https://www.gnu.org/software/libtool/

/ltmain.sh

# http://www.gnu.org/software/texinfo

/texinfo.tex

# http://www.gnu.org/software/m4/

m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4

# Generated Makefile
# (meta build system like autotools,
# can automatically generate from config.status script
# (which is called by configure script))
Makefile

# ----------------------------------------------------
# poudriere-specific gitignore from here

*.o
*.la
*.lo
Expand All @@ -9,10 +66,6 @@
*.full
.*.sw*
libtool
.deps/
.dirstamp
.dirstamp/
/autom4te.cache
/cachec
/cached
/clock
Expand All @@ -33,12 +86,7 @@ libtool
/sh
/timeout
/timestamp
Makefile
config.cache
config.status
config.log
host-upgrade.sh
poudriere.fossil
src/bin/poudriere.8.gz
src/config.h
src/config.h.in~
Expand Down
54 changes: 28 additions & 26 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ awkdir= $(pkgdatadir)/awk
htmldir= $(pkgdatadir)/html
includedir= $(pkgdatadir)/include
assetsdir= $(htmldir)/assets
bootstrapdir= $(assetsdir)/bootstrap-3.1.1
bootstrapdir= $(assetsdir)/bootstrap-3.4.1
btcssdir= $(bootstrapdir)/css
btjsdir= $(bootstrapdir)/js
btfontsdir= $(bootstrapdir)/fonts
datatablesdir= $(assetsdir)/DataTables-1.10.0
datatablesdir= $(assetsdir)/DataTables-1.13.8
dtcssdir= $(datatablesdir)/css
dtimagesdir= $(datatablesdir)/images
dtjsdir= $(datatablesdir)/js
jquerydir= $(assetsdir)/jquery-3.7.1
rcdir= $(sysconfdir)/rc.d
hookdir= $(sysconfdir)/poudriere.d/hooks
mandir= $(prefix)/man
Expand Down Expand Up @@ -117,31 +118,32 @@ dist_assets_DATA= src/share/poudriere/html/assets/poudriere.js \
src/share/poudriere/html/assets/logo.svg \
src/share/poudriere/html/assets/favicon.ico \
src/share/poudriere/html/assets/poudriere.css \
src/share/poudriere/html/assets/jquery-1.11.1.js \
src/share/poudriere/html/assets/jquery-1.11.1.min.js \
src/share/poudriere/html/assets/jquery-1.11.1.min.map \
src/share/poudriere/html/assets/jquery.dataTables.rowGrouping-1.2.9.js
dist_btjs_DATA= src/share/poudriere/html/assets/bootstrap-3.1.1/js/bootstrap.min.js
dist_btfonts_DATA= src/share/poudriere/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.eot \
src/share/poudriere/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.svg \
src/share/poudriere/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.ttf \
src/share/poudriere/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.woff
dist_btcss_DATA= src/share/poudriere/html/assets/bootstrap-3.1.1/css/bootstrap-theme.min.css \
src/share/poudriere/html/assets/bootstrap-3.1.1/css/bootstrap.min.css
dist_dtcss_DATA= src/share/poudriere/html/assets/DataTables-1.10.0/css/jquery.dataTables.min.css \
src/share/poudriere/html/assets/DataTables-1.10.0/css/jquery.dataTables_themeroller.min.css
dist_dtjs_DATA= src/share/poudriere/html/assets/DataTables-1.10.0/js/jquery.dataTables.min.js
dist_dtimages_DATA= src/share/poudriere/html/assets/DataTables-1.10.0/images/back_disabled.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/back_enabled.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/back_enabled_hover.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/forward_disabled.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/forward_enabled.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/forward_enabled_hover.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/sort_asc.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/sort_asc_disabled.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/sort_both.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/sort_desc.png \
src/share/poudriere/html/assets/DataTables-1.10.0/images/sort_desc_disabled.png
dist_btjs_DATA= src/share/poudriere/html/assets/bootstrap-3.4.1/js/bootstrap.js \
src/share/poudriere/html/assets/bootstrap-3.4.1/js/bootstrap.min.js
dist_btfonts_DATA= src/share/poudriere/html/assets/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.eot \
src/share/poudriere/html/assets/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.svg \
src/share/poudriere/html/assets/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.ttf \
src/share/poudriere/html/assets/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.woff \
src/share/poudriere/html/assets/bootstrap-3.4.1/fonts/glyphicons-halflings-regular.woff2
dist_btcss_DATA= src/share/poudriere/html/assets/bootstrap-3.4.1/css/bootstrap-theme.css \
src/share/poudriere/html/assets/bootstrap-3.4.1/css/bootstrap-theme.css.map \
src/share/poudriere/html/assets/bootstrap-3.4.1/css/bootstrap-theme.min.css \
src/share/poudriere/html/assets/bootstrap-3.4.1/css/bootstrap-theme.min.css.map \
src/share/poudriere/html/assets/bootstrap-3.4.1/css/bootstrap.css \
src/share/poudriere/html/assets/bootstrap-3.4.1/css/bootstrap.css.map \
src/share/poudriere/html/assets/bootstrap-3.4.1/css/bootstrap.min.css \
src/share/poudriere/html/assets/bootstrap-3.4.1/css/bootstrap.min.css.map
dist_dtcss_DATA= src/share/poudriere/html/assets/DataTables-1.13.8/css/jquery.dataTables.min.css
dist_dtjs_DATA= src/share/poudriere/html/assets/DataTables-1.13.8/js/jquery.dataTables.min.js
dist_dtimages_DATA= src/share/poudriere/html/assets/DataTables-1.13.8/images/sort_asc.png \
src/share/poudriere/html/assets/DataTables-1.13.8/images/sort_asc_disabled.png \
src/share/poudriere/html/assets/DataTables-1.13.8/images/sort_both.png \
src/share/poudriere/html/assets/DataTables-1.13.8/images/sort_desc.png \
src/share/poudriere/html/assets/DataTables-1.13.8/images/sort_desc_disabled.png
dist_jquery_DATA= src/share/poudriere/html/assets/jquery-3.7.1/jquery-3.7.1.js \
src/share/poudriere/html/assets/jquery-3.7.1/jquery-3.7.1.min.js \
src/share/poudriere/html/assets/jquery-3.7.1/jquery-3.7.1.min.map

dist_rc_SCRIPTS= src/etc/rc.d/poudriered

Expand Down
Loading