Skip to content

Fixed differences between cmake rc files and autotools#10408

Merged
bryancall merged 1 commit intoapache:masterfrom
bryancall:cmake_rc
Sep 14, 2023
Merged

Fixed differences between cmake rc files and autotools#10408
bryancall merged 1 commit intoapache:masterfrom
bryancall:cmake_rc

Conversation

@bryancall
Copy link
Copy Markdown
Contributor

@bryancall bryancall commented Sep 13, 2023

Diff of the two scripts (cmake and autotools generated) before this PR:

09:08:47 zeus:(master)~/dev/apache/trafficserver/build$ diff /opt/ats/bin/trafficserver /tmp/trafficserver.autotools
46c46
< TS_PACKAGE_NAME="trafficserver"
---
> TS_PACKAGE_NAME="Apache Traffic Server"
117c117
< TS_PIDFILE=${TS_PIDFILE:-$TS_BASE/opt/ats/var/server.lock}
---
> TS_PIDFILE=${TS_PIDFILE:-$TS_BASE/opt/ats/var/trafficserver/server.lock}
121c121
< STDOUTLOG=${STDOUTLOG:-$TS_BASE/opt/ats/log/traffic.out}
---
> STDOUTLOG=${STDOUTLOG:-$TS_BASE/opt/ats/var/log/trafficserver/traffic.out}
123c123
< STDERRLOG=${STDERRLOG:-$TS_BASE/opt/ats/log/traffic.out}
---
> STDERRLOG=${STDERRLOG:-$TS_BASE/opt/ats/var/log/trafficserver/traffic.out}
182,184c182,184
< if [ ! -d $TS_BASE/opt/ats/var ]; then
< 	mkdir -p $TS_BASE/opt/ats/var
< 	chown nobody: $TS_BASE/opt/ats/var
---
> if [ ! -d $TS_BASE/opt/ats/var/trafficserver ]; then
> 	mkdir -p $TS_BASE/opt/ats/var/trafficserver
> 	chown nobody:nobody $TS_BASE/opt/ats/var/trafficserver

@bryancall bryancall added the CMake work related to CMakes scripts or issues label Sep 13, 2023
@bryancall bryancall added this to the 10.0.0 milestone Sep 13, 2023
@bryancall bryancall requested a review from cmcfarlen September 13, 2023 16:06
@bryancall bryancall self-assigned this Sep 13, 2023
@bryancall bryancall merged commit 561b409 into apache:master Sep 14, 2023
cmcfarlen pushed a commit to cmcfarlen/trafficserver that referenced this pull request Jun 3, 2024
* asf/master:
  This drops the _stat suffix from some metrics (apache#10441)
  Fix CID-1518256 (apache#10403)
  Restore original metrics names, these were typos (apache#10440)
  Use the new Metrics module for core metrics (apache#10175)
  Fix use-after-free issue (apache#10399)
  Fixed differences between cmake rc files and autotools (apache#10408)
  Fix hwloc build (apache#10406)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CMake work related to CMakes scripts or issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants